diff options
Diffstat (limited to 'freetype')
| -rw-r--r-- | freetype/freetype-native_2.1.7.oe | 14 | ||||
| -rw-r--r-- | freetype/freetype_2.1.7.oe | 19 |
2 files changed, 14 insertions, 19 deletions
diff --git a/freetype/freetype-native_2.1.7.oe b/freetype/freetype-native_2.1.7.oe index c538408d0b..e4e3e065d1 100644 --- a/freetype/freetype-native_2.1.7.oe +++ b/freetype/freetype-native_2.1.7.oe @@ -1,8 +1,7 @@ DESCRIPTION = "Freetype font rendering library" -FT_SONAME = 6.3.5 -SRC_URI = ftp://ftp.freetype.org/freetype/freetype2/freetype-${PV}.tar.bz2 \ - file://${FILESDIR}/configure.patch;patch=1 +SRC_URI = "ftp://ftp.freetype.org/freetype/freetype2/freetype-${PV}.tar.bz2 \ + file://${FILESDIR}/configure.patch;patch=1" inherit autotools pkgconfig native DEPENDS = "patcher-native" @@ -15,12 +14,11 @@ do_configure () { } do_stage () { - install -m 755 -D objs/.libs/libfreetype.so.${FT_SONAME} ${STAGING_LIBDIR}/libfreetype.so.${FT_SONAME} - ln -sf ./libfreetype.so.${FT_SONAME} ${STAGING_LIBDIR}/libfreetype.so.6 - ln -sf ./libfreetype.so.${FT_SONAME} ${STAGING_LIBDIR}/libfreetype.so + oe_soinstall objs/.libs/libfreetype.so.6.3.5 ${STAGING_LIBDIR}/ install -m 0644 objs/.libs/libfreetype.lai ${STAGING_LIBDIR}/libfreetype.la - cp -a include/*.h ${STAGING_INCDIR} + install -m 0644 objs/.libs/libfreetype.a ${STAGING_LIBDIR}/libfreetype.a + cp -a ${S}/include/*.h ${STAGING_INCDIR} install -d ${STAGING_INCDIR}/freetype2 - cp -a include/freetype ${STAGING_INCDIR}/freetype2/ + cp -a ${S}/include/freetype ${STAGING_INCDIR}/freetype2/ } diff --git a/freetype/freetype_2.1.7.oe b/freetype/freetype_2.1.7.oe index 16302e997a..61b71177de 100644 --- a/freetype/freetype_2.1.7.oe +++ b/freetype/freetype_2.1.7.oe @@ -2,15 +2,13 @@ DESCRIPTION = "Freetype font rendering library" DEPENDS = "virtual/libc" RDEPENDS = "libc6" -FT_SONAME = 6.3.5 - -SRC_URI = ftp://ftp.freetype.org/freetype/freetype2/freetype-${PV}.tar.bz2 \ - file://${FILESDIR}/configure.patch;patch=1 +SRC_URI = "ftp://ftp.freetype.org/freetype/freetype2/freetype-${PV}.tar.bz2 \ + file://${FILESDIR}/configure.patch;patch=1" inherit autotools libtool pkgconfig LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool" -EXTRA_OEMAKE="'LIBTOOL=${LIBTOOL}'" +EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'" do_configure () { cd builds/unix @@ -21,16 +19,15 @@ do_configure () { } do_stage () { - install -m 755 -D objs/.libs/libfreetype.so.${FT_SONAME} ${STAGING_LIBDIR}/libfreetype.so.${FT_SONAME} - ln -sf ./libfreetype.so.${FT_SONAME} ${STAGING_LIBDIR}/libfreetype.so.6 - ln -sf ./libfreetype.so.${FT_SONAME} ${STAGING_LIBDIR}/libfreetype.so + oe_soinstall objs/.libs/libfreetype.so.6.3.5 ${STAGING_LIBDIR}/ install -m 0644 objs/.libs/libfreetype.lai ${STAGING_LIBDIR}/libfreetype.la - cp -a include/*.h ${STAGING_INCDIR} + install -m 0644 objs/.libs/libfreetype.a ${STAGING_LIBDIR}/ + cp -a ${S}/include/*.h ${STAGING_INCDIR} install -d ${STAGING_INCDIR}/freetype2 - cp -a include/freetype ${STAGING_INCDIR}/freetype2/ + cp -a ${S}/include/freetype ${STAGING_INCDIR}/freetype2/ - sed -e 's,${prefix},${STAGING_DIR}/target,' < builds/unix/freetype-config > ${STAGING_BINDIR}/freetype-config + sed -e 's,${prefix},${STAGING_LIBDIR}/..,' < builds/unix/freetype-config > ${STAGING_BINDIR}/freetype-config chmod u+x ${STAGING_BINDIR}/freetype-config } |