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 () {
     else:
         autoextend = False
     for dep in deps:
+        if dep.endswith("-cross"):
+            if autoextend:
+                depends = depends.replace(dep, dep.replace("-cross", "-native"))
+            else:
+                bb.note("%s has depends %s which ends in -cross?" % (pn, dep))
+
         if not dep.endswith("-native"):
             if autoextend:
                 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 @@
-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 645b2c45c6..0000000000
--- 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 992f0c34f0..0000000000
--- 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 b6e15c3ae2..0000000000
--- 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 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"
 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"