summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 de2de0934..000000000
--- a/meta/packages/libpng/libpng-native_1.2.20.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require libpng_${PV}.bb
-inherit native
-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/meta/packages/libpng/libpng_1.2.20.bb b/meta/packages/libpng/libpng_1.2.20.bb
index 9ff1733db..e9fb06179 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"
SECTION = "libs"
DEPENDS = "zlib"
PRIORITY = "required"
-PR = "r6"
+PR = "r7"
SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2 \
file://makefile_fix.patch;patch=1"
inherit autotools binconfig pkgconfig pkgconfig_stage
-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
-}
-
do_install() {
install -d ${D}${bindir}
install -d ${D}${mandir}
@@ -47,3 +38,5 @@ FILES_${PN} = "${libdir}/lib*${SOLIBS}"
FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
${libdir}/*.a ${libdir}/pkgconfig \
${datadir}/aclocal ${bindir} ${sbindir}"
+
+BBCLASSEXTEND = "native"