summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/native.bbclass6
-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
6 files changed, 9 insertions, 44 deletions
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index 9f6501f583..077ac9c8a3 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -105,6 +105,12 @@ python __anonymous () {
105 else: 105 else:
106 autoextend = False 106 autoextend = False
107 for dep in deps: 107 for dep in deps:
108 if dep.endswith("-cross"):
109 if autoextend:
110 depends = depends.replace(dep, dep.replace("-cross", "-native"))
111 else:
112 bb.note("%s has depends %s which ends in -cross?" % (pn, dep))
113
108 if not dep.endswith("-native"): 114 if not dep.endswith("-native"):
109 if autoextend: 115 if autoextend:
110 depends = depends.replace(dep, dep + "-native") 116 depends = depends.replace(dep, dep + "-native")
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}