zlib-1.2.3: -made zlib uses autotools, that introduced autotools.patch and

            make libtool_staging.patch and sane-target.patch obsolete
	    -adding myself as maintainer after talked with kergoth
	    -simplify zlib_1.2.3.bb

1 files changed, 4 insertions, 19 deletions

diff --git a/packages/zlib/zlib_1.2.3.bb b/packages/zlib/zlib_1.2.3.bb
index 8a48a89fdf..507b32eff9 100644
--- a/packages/zlib/zlib_1.2.3.bb
+++ b/packages/zlib/zlib_1.2.3.bb
@@ -1,39 +1,24 @@
 DESCRIPTION = "Zlib Compression Library"
 SECTION = "libs"
 PRIORITY = "required"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+MAINTAINER = "Henning Heinold <heinold@inf.fu-berlin.de>"
 HOMEPAGE = "http://www.gzip.org/zlib/"
 LICENSE = "zlib"
+PR="r1"
 
 SRC_URI = "http://www.zlib.net/zlib-1.2.3.tar.bz2 \
 		file://visibility.patch;patch=1 \
-		file://libtool_staging.patch;patch=1 \
-		file://sane-target.patch;patch=1 "
+		file://autotools.patch;patch=1 "
 
 S = "${WORKDIR}/zlib-${PV}"
 
 DEPENDS = "libtool-cross"
 
-export LDSHARED = "${CC} -shared -Wl,-soname,libz.so.1"
-LDFLAGS_append = " -L. -lz"
-CFLAGS_prepend = "-fPIC -DZLIB_DLL "
-AR_append = " rc"
-EXTRA_OEMAKE = " LIBTOOL=${TARGET_SYS}-libtool"
-
-# extra configure options, can be reset in the -native variant
-ZLIB_EXTRA = "--target=${TARGET_OS}"
-ZLIB_SHARED= "libz.so.${PV}"
-
-do_compile() {
-	./configure --prefix=${prefix} --exec_prefix=${exec_prefix} --shared --libdir=${libdir} --includedir=${includedir} ${ZLIB_EXTRA}
-	oe_runmake -e MAKEFLAGS="" ${ZLIB_SHARED} libz.a
-}
+inherit autotools
 
 do_stage() {
 	install -m 0644 zlib.h ${STAGING_INCDIR}/zlib.h
 	install -m 0644 zconf.h ${STAGING_INCDIR}/zconf.h
-
-	mv libz.la ${STAGING_LIBDIR}/
 	oe_libinstall -a -so libz ${STAGING_LIBDIR}
 }