diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2009-01-03 17:31:17 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-01-03 17:31:17 +0000 |
| commit | c4a39f6417e7570ca3229943c7fcde49d72f6bf8 (patch) | |
| tree | f9f6b6967c3d3e074b9213dcd81e17bf231b9065 /meta/packages/zlib | |
| parent | 64c7fa473413d998c2a99c79ef0de34ecc133aef (diff) | |
| download | openembedded-core-c4a39f6417e7570ca3229943c7fcde49d72f6bf8.tar.gz openembedded-core-c4a39f6417e7570ca3229943c7fcde49d72f6bf8.tar.bz2 openembedded-core-c4a39f6417e7570ca3229943c7fcde49d72f6bf8.tar.xz openembedded-core-c4a39f6417e7570ca3229943c7fcde49d72f6bf8.zip | |
zlib: Clean up recipe and use BBCLASSEXTEND for native and sdk versions
Diffstat (limited to 'meta/packages/zlib')
| -rw-r--r-- | meta/packages/zlib/zlib-native.inc | 11 | ||||
| -rw-r--r-- | meta/packages/zlib/zlib-native_1.2.3.bb | 2 | ||||
| -rw-r--r-- | meta/packages/zlib/zlib-sdk.inc | 10 | ||||
| -rw-r--r-- | meta/packages/zlib/zlib-sdk_1.2.3.bb | 2 | ||||
| -rw-r--r-- | meta/packages/zlib/zlib_1.2.3.bb | 22 |
5 files changed, 3 insertions, 44 deletions
diff --git a/meta/packages/zlib/zlib-native.inc b/meta/packages/zlib/zlib-native.inc deleted file mode 100644 index 2228710e8..000000000 --- a/meta/packages/zlib/zlib-native.inc +++ /dev/null @@ -1,11 +0,0 @@ -ZLIB_EXTRA = "" -inherit native - -do_stage() { - install -m 0644 zlib.h ${STAGING_INCDIR}/ - install -m 0644 zconf.h ${STAGING_INCDIR}/ - install -m 0644 zlibdefs.h ${STAGING_INCDIR}/ - oe_libinstall -a -so libz ${STAGING_LIBDIR} -} - -DEPENDS = "libtool-native" diff --git a/meta/packages/zlib/zlib-native_1.2.3.bb b/meta/packages/zlib/zlib-native_1.2.3.bb deleted file mode 100644 index 645b2c45c..000000000 --- a/meta/packages/zlib/zlib-native_1.2.3.bb +++ /dev/null @@ -1,2 +0,0 @@ -require zlib_${PV}.bb -require zlib-native.inc diff --git a/meta/packages/zlib/zlib-sdk.inc b/meta/packages/zlib/zlib-sdk.inc deleted file mode 100644 index 992f0c34f..000000000 --- a/meta/packages/zlib/zlib-sdk.inc +++ /dev/null @@ -1,10 +0,0 @@ -ZLIB_EXTRA = "" -inherit sdk - -do_stage() { - install -d ${STAGING_INCDIR} - install -m 0644 zlib.h ${STAGING_INCDIR}/ - install -m 0644 zconf.h ${STAGING_INCDIR}/ - install -m 0644 zlibdefs.h ${STAGING_INCDIR}/ - oe_libinstall -a -so libz ${STAGING_LIBDIR} -} diff --git a/meta/packages/zlib/zlib-sdk_1.2.3.bb b/meta/packages/zlib/zlib-sdk_1.2.3.bb deleted file mode 100644 index b6e15c3ae..000000000 --- a/meta/packages/zlib/zlib-sdk_1.2.3.bb +++ /dev/null @@ -1,2 +0,0 @@ -require zlib_${PV}.bb -require zlib-sdk.inc diff --git a/meta/packages/zlib/zlib_1.2.3.bb b/meta/packages/zlib/zlib_1.2.3.bb index 25677733f..ca54b6abf 100644 --- a/meta/packages/zlib/zlib_1.2.3.bb +++ b/meta/packages/zlib/zlib_1.2.3.bb @@ -3,31 +3,15 @@ SECTION = "libs" PRIORITY = "required" HOMEPAGE = "http://www.gzip.org/zlib/" LICENSE = "zlib" -PR = "r6" +PR = "r7" SRC_URI = "http://www.zlib.net/zlib-1.2.3.tar.bz2 \ file://1.2.3.3.dfsg.patch.gz;patch=1 \ file://visibility.patch;patch=1 \ file://autotools.patch;patch=1 " -S = "${WORKDIR}/zlib-${PV}" - DEPENDS = "libtool-cross" -inherit autotools - -do_stage() { - install -m 0644 zlib.h ${STAGING_INCDIR}/ - install -m 0644 zconf.h ${STAGING_INCDIR}/ - install -m 0644 zlibdefs.h ${STAGING_INCDIR}/ - oe_libinstall -a -so libz ${STAGING_LIBDIR} -} +inherit autotools_stage -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 -} +BBCLASSEXTEND = "native sdk" |