diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2006-09-11 23:50:48 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2006-09-11 23:50:48 +0000 |
| commit | 886a33cfdf3d67355858dab7513cf02f99f71070 (patch) | |
| tree | ff6d523b3ac4de1d1b6bee468ba260a0694b6736 /packages | |
| parent | bd9afea381b1370301650d407a70d39752b1181c (diff) | |
| parent | bd4ed80c3eadc1539f3e90e956c076d62aa0d49c (diff) | |
merge of '1b9ad8be7ef3071bd7dd0eca9ade2548cb1a11d9'
and 'eed5ae4efe4ce1cb698a47eda73593279e7c3f9a'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/libpng/libpng_1.2.12.bb | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/packages/libpng/libpng_1.2.12.bb b/packages/libpng/libpng_1.2.12.bb index 66b691b617..deff600a7a 100644 --- a/packages/libpng/libpng_1.2.12.bb +++ b/packages/libpng/libpng_1.2.12.bb @@ -4,7 +4,7 @@ LICENSE = "libpng" SECTION = "libs" PRIORITY = "required" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" -PR = "r3" +PR = "r4" DEPENDS = "zlib" @@ -21,36 +21,13 @@ FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \ SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2" S = "${WORKDIR}/libpng-${PV}" -inherit pkgconfig binconfig pkgconfig - -EXTRA_OEMAKE_append = " ZLIBINC=${STAGING_INCDIR} ZLIBLIB=${STAGING_LIBDIR}" -CFLAGS += "-DPNG_NO_ASSEMBLER_CODE" - -do_compile() { - sed < scripts/makefile.linux > makefile -e 's/^ZLIBINC.*//' -e 's/^ZLIBLIB.*//' - unset LDFLAGS - oe_runmake 'CC=${CC}' 'LD=${LD}' 'CFLAGS=${CFLAGS}' \ - 'ZLIBINC=${STAGING_INCDIR}' \ - 'ZLIBLIB=${STAGING_LIBDIR}' -} - -# apperently libpng doesn't expand the vars in libpng.pc, so we'll do that with sed -# pkgconfig.bbclass will use a similar trick to fix them - -do_stage_prepend() { - sed -i -e 's:=@libdir@:=${libdir}:;' \ - -e 's:=@includedir@:=${includedir}:;' \ - -e 's:=@prefix@:=${prefix}:' \ - -e 's:=@exec_prefix@:=${exec_prefix}:' \ - -e 's:-lpng12:-lpng12\ -lz\ -lm:' \ - libpng.pc - -} +inherit autotools binconfig pkgconfig do_stage() { cp libpng.pc libpng12.pc install -m 644 png.h ${STAGING_INCDIR}/png.h install -m 644 pngconf.h ${STAGING_INCDIR}/pngconf.h + oe_libinstall -so libpng ${STAGING_LIBDIR}/ oe_libinstall -so libpng12 ${STAGING_LIBDIR}/ ln -sf libpng12.so ${STAGING_LIBDIR}/libpng.so } |