zziplib: convert to BBCLASSEXTEND and use new patch system

diff --git a/recipes/zziplib/files/automake.patch b/recipes/zziplib/files/automake.patch
new file mode 100644 (file)
index 0000000..aeba741
--- /dev/null
+++ b/recipes/zziplib/files/automake.patch
@@ -0,0 +1,23 @@
+Index: zziplib-0.13.49/zzip/Makefile.am
+===================================================================
+--- zziplib-0.13.49.orig/zzip/Makefile.am      2010-06-07 02:16:47.749129902 +0200
++++ zziplib-0.13.49/zzip/Makefile.am   2010-06-07 02:17:08.932466913 +0200
+@@ -44,14 +44,14 @@
+                     $(THREAD_SAFE)
+ libzzip_la_LIBADD= -lz @RESOLVES@
+ 
+-libzzipmmapped_la_SOURCES =  mmapped.c memdisk.c fetch.c
+-libzzipmmapped_la_headers =  mmapped.h memdisk.h fetch.h
++libzzipmmapped_la_SOURCES =  mmapped.c memdisk.c fetch.c fetch.h
++libzzipmmapped_la_headers =  mmapped.h memdisk.h
+ libzzipmmapped_la_LDFLAGS= @ZZIPLIB_LDFLAGS@ $(RELEASE_INFO) $(VERSION_INFO) \
+                     $(THREAD_SAFE)
+ libzzipmmapped_la_LIBADD= -lz @RESOLVES@
+ 
+-libzzipfseeko_la_SOURCES = fseeko.c fetch.c
+-libzzipfseeko_la_headers = fseeko.h fetch.h
++libzzipfseeko_la_SOURCES = fseeko.c fetch.c fetch.h
++libzzipfseeko_la_headers = fseeko.h
+ libzzipfseeko_la_LDFLAGS= @ZZIPLIB_LDFLAGS@ $(RELEASE_INFO) $(VERSION_INFO) \
+                     $(THREAD_SAFE)
+ libzzipfseeko_la_LIBADD= -lz @RESOLVES@

diff --git a/recipes/zziplib/zziplib-native_0.13.49.bb b/recipes/zziplib/zziplib-native_0.13.49.bb
deleted file mode 100644 (file)
index eb954f1..0000000
--- a/recipes/zziplib/zziplib-native_0.13.49.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require zziplib_${PV}.bb
-
-DEPENDS = "zlib-native"
-
-inherit native
-
-S = "${WORKDIR}/zziplib-${PV}"
-
-PACKAGES = ""

diff --git a/recipes/zziplib/zziplib.inc b/recipes/zziplib/zziplib.inc
index e0ef3f2..5951ed6 100644 (file)
--- a/recipes/zziplib/zziplib.inc
+++ b/recipes/zziplib/zziplib.inc
@@ -9,6 +9,8 @@ LICENSE = "LGPL MPL"
 
 inherit autotools pkgconfig
 
+BBCLASSEXTEND = "native"
+
 do_configure_append() {
        # Fix some brokenness in the generated makefile.
        sed -i \
@@ -19,12 +21,3 @@ do_configure_append() {
 
   mkdir ${S}/build
 }
-
-
-do_compile_append() {
-for i in ${S}/*/*.pc ; do
-        sed -i -e s:${STAGING_DIR_TARGET}::g \
-               -e s:/${TARGET_SYS}::g \
-                  $i
-done
-}

diff --git a/recipes/zziplib/zziplib_0.13.49.bb b/recipes/zziplib/zziplib_0.13.49.bb
index 3aecb74..256b13d 100644 (file)
--- a/recipes/zziplib/zziplib_0.13.49.bb
+++ b/recipes/zziplib/zziplib_0.13.49.bb
@@ -3,8 +3,9 @@ require zziplib.inc
 PR = "r2"
 
 SRC_URI += "\
-  file://zip_c.patch \
-  file://zziplib-autoconf.patch \
+  file://zip_c.patch;apply=yes \
+  file://zziplib-autoconf.patch;apply=yes \
+  file://automake.patch;apply=yes \
   "
 
 SRC_URI[md5sum] = "5f7b88ebb2bcd7e8044328482d079661"