summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-01-03 17:31:17 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-01-03 17:31:17 +0000
commitc4a39f6417e7570ca3229943c7fcde49d72f6bf8 (patch)
treef9f6b6967c3d3e074b9213dcd81e17bf231b9065 /meta/packages
parent64c7fa473413d998c2a99c79ef0de34ecc133aef (diff)
downloadpoky-c4a39f6417e7570ca3229943c7fcde49d72f6bf8.tar.gz
zlib: Clean up recipe and use BBCLASSEXTEND for native and sdk versions
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/zlib/zlib-native.inc11
-rw-r--r--meta/packages/zlib/zlib-native_1.2.3.bb2
-rw-r--r--meta/packages/zlib/zlib-sdk.inc10
-rw-r--r--meta/packages/zlib/zlib-sdk_1.2.3.bb2
-rw-r--r--meta/packages/zlib/zlib_1.2.3.bb22
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 2228710e8f..0000000000
--- a/meta/packages/zlib/zlib-native.inc
+++ /dev/null
@@ -1,11 +0,0 @@
1ZLIB_EXTRA = ""
2inherit native
3
4do_stage() {
5 install -m 0644 zlib.h ${STAGING_INCDIR}/
6 install -m 0644 zconf.h ${STAGING_INCDIR}/
7 install -m 0644 zlibdefs.h ${STAGING_INCDIR}/
8 oe_libinstall -a -so libz ${STAGING_LIBDIR}
9}
10
11DEPENDS = "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 645b2c45c6..0000000000
--- a/meta/packages/zlib/zlib-native_1.2.3.bb
+++ /dev/null
@@ -1,2 +0,0 @@
1require zlib_${PV}.bb
2require zlib-native.inc
diff --git a/meta/packages/zlib/zlib-sdk.inc b/meta/packages/zlib/zlib-sdk.inc
deleted file mode 100644
index 992f0c34f0..0000000000
--- a/meta/packages/zlib/zlib-sdk.inc
+++ /dev/null
@@ -1,10 +0,0 @@
1ZLIB_EXTRA = ""
2inherit sdk
3
4do_stage() {
5 install -d ${STAGING_INCDIR}
6 install -m 0644 zlib.h ${STAGING_INCDIR}/
7 install -m 0644 zconf.h ${STAGING_INCDIR}/
8 install -m 0644 zlibdefs.h ${STAGING_INCDIR}/
9 oe_libinstall -a -so libz ${STAGING_LIBDIR}
10}
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 b6e15c3ae2..0000000000
--- a/meta/packages/zlib/zlib-sdk_1.2.3.bb
+++ /dev/null
@@ -1,2 +0,0 @@
1require zlib_${PV}.bb
2require zlib-sdk.inc
diff --git a/meta/packages/zlib/zlib_1.2.3.bb b/meta/packages/zlib/zlib_1.2.3.bb
index 25677733f8..ca54b6abfb 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"
3PRIORITY = "required" 3PRIORITY = "required"
4HOMEPAGE = "http://www.gzip.org/zlib/" 4HOMEPAGE = "http://www.gzip.org/zlib/"
5LICENSE = "zlib" 5LICENSE = "zlib"
6PR = "r6" 6PR = "r7"
7 7
8SRC_URI = "http://www.zlib.net/zlib-1.2.3.tar.bz2 \ 8SRC_URI = "http://www.zlib.net/zlib-1.2.3.tar.bz2 \
9 file://1.2.3.3.dfsg.patch.gz;patch=1 \ 9 file://1.2.3.3.dfsg.patch.gz;patch=1 \
10 file://visibility.patch;patch=1 \ 10 file://visibility.patch;patch=1 \
11 file://autotools.patch;patch=1 " 11 file://autotools.patch;patch=1 "
12 12
13S = "${WORKDIR}/zlib-${PV}"
14
15DEPENDS = "libtool-cross" 13DEPENDS = "libtool-cross"
16 14
17inherit autotools 15inherit autotools_stage
18
19do_stage() {
20 install -m 0644 zlib.h ${STAGING_INCDIR}/
21 install -m 0644 zconf.h ${STAGING_INCDIR}/
22 install -m 0644 zlibdefs.h ${STAGING_INCDIR}/
23 oe_libinstall -a -so libz ${STAGING_LIBDIR}
24}
25 16
26do_install() { 17BBCLASSEXTEND = "native sdk"
27 install -d ${D}${prefix} ${D}${includedir} ${D}${libdir}
28 oe_runmake "prefix=${D}${prefix}" \
29 "exec_prefix=${D}${exec_prefix}" \
30 "man3dir=${D}${mandir}/man3" \
31 "includedir=${D}${includedir}" \
32 "libdir=${D}${libdir}" install
33}