aboutsummaryrefslogtreecommitdiffstats
path: root/packages/libpng
diff options
context:
space:
mode:
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-05-16 10:39:43 +0000
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-05-16 10:39:43 +0000
commitf80a95d2b6cf850caa9c51128a3be4ab213e154a (patch)
tree48a7d4adb616f2aea2cf8f04cdbdcbef2db7dd57 /packages/libpng
parent958588c6d18a958f5d3e5ccc98fc5c1069e355f3 (diff)
downloadopenembedded-f80a95d2b6cf850caa9c51128a3be4ab213e154a.tar.gz
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/05/16 12:31:29+02:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/05/16 12:31:18+02:00 uni-frankfurt.de!mickeyl lock down embryo version 2005/05/16 12:30:48+02:00 uni-frankfurt.de!mickeyl repeat do_stage() in libpng-native to fix an odd packaging error on some systems 2005/05/16 11:11:48+01:00 rpsys.net!RP Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into tim.rpsys.net:/usr/oe/openembedded 2005/05/16 11:11:21+01:00 rpsys.net!RP linux-oz-2.6: Tosa updates from Dirk. Also add preliminary sptiz support under 2.6 - thanks BigAl! 2005/05/16 12:10:29+02:00 utwente.nl!koen familiar-0.9.0.conf: include preferred-e-versions.inc, courtesy Buildmeister Lauer 2005/05/16 12:04:27+02:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/05/16 12:04:14+02:00 uni-frankfurt.de!mickeyl bump openzaurus-3.5.4 and lock down our e packages to my working versions through preferred-e-versions.inc 2005/05/16 12:03:24+02:00 utwente.nl!koen Added packages/thc/ dir for stuff from http://thc.org/, moved hydra and thcrut into it. 2005/05/16 10:20:43+01:00 rpsys.net!RP linux-oz-2.6: Update to later irda patch BKrev: 4288786fKHhlElesndlOW9HB4IcxyQ
Diffstat (limited to 'packages/libpng')
-rw-r--r--packages/libpng/libpng-native_1.2.8.bb12
-rw-r--r--packages/libpng/libpng_1.2.8.bb2
2 files changed, 13 insertions, 1 deletions
diff --git a/packages/libpng/libpng-native_1.2.8.bb b/packages/libpng/libpng-native_1.2.8.bb
index e69de29bb2..7e611bf4a5 100644
--- a/packages/libpng/libpng-native_1.2.8.bb
+++ b/packages/libpng/libpng-native_1.2.8.bb
@@ -0,0 +1,12 @@
+include libpng_${PV}.bb
+inherit native
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpng-${PV}"
+DEPENDS = "zlib-native"
+
+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 libpng12 ${STAGING_LIBDIR}/
+ ln -sf libpng12.so ${STAGING_LIBDIR}/libpng.so
+}
diff --git a/packages/libpng/libpng_1.2.8.bb b/packages/libpng/libpng_1.2.8.bb
index a93587c3a0..05f681527c 100644
--- a/packages/libpng/libpng_1.2.8.bb
+++ b/packages/libpng/libpng_1.2.8.bb
@@ -35,7 +35,7 @@ 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 libpng12 ${STAGING_LIBDIR}
+ oe_libinstall -so libpng12 ${STAGING_LIBDIR}/
ln -sf libpng12.so ${STAGING_LIBDIR}/libpng.so
}