diff options
| -rw-r--r-- | packages/zlib/zlib-native_1.2.3.bb | 11 | ||||
| -rw-r--r-- | packages/zlib/zlib_1.2.3.bb | 17 |
2 files changed, 5 insertions, 23 deletions
diff --git a/packages/zlib/zlib-native_1.2.3.bb b/packages/zlib/zlib-native_1.2.3.bb index 246bf2835c..d7e0777f34 100644 --- a/packages/zlib/zlib-native_1.2.3.bb +++ b/packages/zlib/zlib-native_1.2.3.bb @@ -1,12 +1,5 @@ require zlib_${PV}.bb ZLIB_EXTRA = "" -inherit native - -do_stage() { - install -m 0644 zlib.h ${STAGING_INCDIR}/zlib.h - install -m 0644 zconf.h ${STAGING_INCDIR}/zconf.h - oe_libinstall -a -so libz ${STAGING_LIBDIR} -} - - DEPENDS = "libtool-native" + +inherit native diff --git a/packages/zlib/zlib_1.2.3.bb b/packages/zlib/zlib_1.2.3.bb index 1f96816ae8..d4efeb08c8 100644 --- a/packages/zlib/zlib_1.2.3.bb +++ b/packages/zlib/zlib_1.2.3.bb @@ -3,7 +3,7 @@ SECTION = "libs" PRIORITY = "required" HOMEPAGE = "http://www.gzip.org/zlib/" LICENSE = "zlib" -PR="r4" +PR="r5" SRC_URI = "http://www.zlib.net/zlib-1.2.3.tar.bz2 \ file://visibility.patch;patch=1 \ @@ -13,19 +13,8 @@ S = "${WORKDIR}/zlib-${PV}" DEPENDS = "libtool-cross" -inherit autotools pkgconfig +inherit autotools do_stage() { - install -m 0644 zlib.h ${STAGING_INCDIR}/zlib.h - install -m 0644 zconf.h ${STAGING_INCDIR}/zconf.h - oe_libinstall -a -so libz ${STAGING_LIBDIR} -} - -do_install() { - install -d ${D}${prefix} ${D}${includedir} ${D}${libdir} - oe_runmake "prefix=${D}${prefix}" \ - "exec_prefix=${D}${exec_prefix}" \ - "man3dir=${D}${mandir}/man3" \ - "includedir=${D}${includedir}" \ - "libdir=${D}${libdir}" install + autotools_stage_all } |