summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-11-05 12:57:38 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-11-13 12:15:24 +0000
commitc304734adfd294317ef703749354a46d9375255f (patch)
tree5ec2d39682eee9cbffe333466ef3971819f145b3 /meta/packages
parentafc22e54aea54fe030722502f865565d8b7133c4 (diff)
downloadpoky-c304734adfd294317ef703749354a46d9375255f.tar.gz
libpng: Convert to BBCLASSEXTEND and drop custom staging function as unneeded
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/libpng/libpng-native_1.2.20.bb11
-rw-r--r--meta/packages/libpng/libpng_1.2.20.bb13
2 files changed, 3 insertions, 21 deletions
diff --git a/meta/packages/libpng/libpng-native_1.2.20.bb b/meta/packages/libpng/libpng-native_1.2.20.bb
deleted file mode 100644
index de2de0934b..0000000000
--- a/meta/packages/libpng/libpng-native_1.2.20.bb
+++ /dev/null
@@ -1,11 +0,0 @@
1require libpng_${PV}.bb
2inherit native
3DEPENDS = "zlib-native"
4
5do_stage() {
6 cp libpng.pc libpng12.pc
7 install -m 644 png.h ${STAGING_INCDIR}/png.h
8 install -m 644 pngconf.h ${STAGING_INCDIR}/pngconf.h
9 oe_libinstall -so libpng12 ${STAGING_LIBDIR}/
10 ln -sf libpng12.so ${STAGING_LIBDIR}/libpng.so
11}
diff --git a/meta/packages/libpng/libpng_1.2.20.bb b/meta/packages/libpng/libpng_1.2.20.bb
index 9ff1733db8..e9fb06179a 100644
--- a/meta/packages/libpng/libpng_1.2.20.bb
+++ b/meta/packages/libpng/libpng_1.2.20.bb
@@ -4,22 +4,13 @@ LICENSE = "libpng"
4SECTION = "libs" 4SECTION = "libs"
5DEPENDS = "zlib" 5DEPENDS = "zlib"
6PRIORITY = "required" 6PRIORITY = "required"
7PR = "r6" 7PR = "r7"
8 8
9SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2 \ 9SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2 \
10 file://makefile_fix.patch;patch=1" 10 file://makefile_fix.patch;patch=1"
11 11
12inherit autotools binconfig pkgconfig pkgconfig_stage 12inherit autotools binconfig pkgconfig pkgconfig_stage
13 13
14do_stage() {
15 cp libpng.pc libpng12.pc
16 install -m 644 png.h ${STAGING_INCDIR}/png.h
17 install -m 644 pngconf.h ${STAGING_INCDIR}/pngconf.h
18 oe_libinstall -so libpng ${STAGING_LIBDIR}/
19 oe_libinstall -so libpng12 ${STAGING_LIBDIR}/
20 ln -sf libpng12.so ${STAGING_LIBDIR}/libpng.so
21}
22
23do_install() { 14do_install() {
24 install -d ${D}${bindir} 15 install -d ${D}${bindir}
25 install -d ${D}${mandir} 16 install -d ${D}${mandir}
@@ -47,3 +38,5 @@ FILES_${PN} = "${libdir}/lib*${SOLIBS}"
47FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \ 38FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
48 ${libdir}/*.a ${libdir}/pkgconfig \ 39 ${libdir}/*.a ${libdir}/pkgconfig \
49 ${datadir}/aclocal ${bindir} ${sbindir}" 40 ${datadir}/aclocal ${bindir} ${sbindir}"
41
42BBCLASSEXTEND = "native"