zlib: cleanup and sync with OE

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2924 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 5 insertions, 10 deletions

diff --git a/meta/packages/zlib/zlib_1.2.3.bb b/meta/packages/zlib/zlib_1.2.3.bb
index 6bb34ceaf0..629ee83efb 100644
--- a/meta/packages/zlib/zlib_1.2.3.bb
+++ b/meta/packages/zlib/zlib_1.2.3.bb
@@ -3,22 +3,17 @@ SECTION = "libs"
 PRIORITY = "required"
 HOMEPAGE = "http://www.gzip.org/zlib/"
 LICENSE = "zlib"
+PR="r2"
 
 SRC_URI = "http://www.zlib.net/zlib-1.2.3.tar.bz2 \
-                file://visibility.patch;patch=1"
+                file://visibility.patch;patch=1 \
+                file://autotools.patch;patch=1 "
 
 S = "${WORKDIR}/zlib-${PV}"
 
-export LDSHARED = "${CC} -shared -Wl,-soname,libz.so.1"
-LDFLAGS_append = " -L. -lz"
-CFLAGS_prepend = "-fPIC -DZLIB_DLL "
-AR_append = " rc"
-EXTRA_OEMAKE = ""
+DEPENDS = "libtool-cross"
 
-do_compile() {
-        ./configure --prefix=${prefix} --exec_prefix=${exec_prefix} --shared --libdir=${libdir} --includedir=${includedir}
-        oe_runmake -e MAKEFLAGS="" libz.so.${PV} libz.a
-}
+inherit autotools
 
 do_stage() {
         install -m 0644 zlib.h ${STAGING_INCDIR}/zlib.h