diff options
| author | Henning Heinold <heinold@inf.fu-berlin.de> | 2010-06-08 01:34:58 +0200 |
|---|---|---|
| committer | Henning Heinold <heinold@inf.fu-berlin.de> | 2010-06-08 11:46:56 +0200 |
| commit | 8031ee4953f3510d53022ce0e53bc903d3089f30 (patch) | |
| tree | 90ae458f52147fd73d5fe261ce7167f2db8e9310 /recipes | |
| parent | 14c265b107725a8f7534dfb354ad12edf9f7aec3 (diff) | |
zziplib: convert to BBCLASSEXTEND and use new patch system
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/zziplib/files/automake.patch | 23 | ||||
| -rw-r--r-- | recipes/zziplib/zziplib-native_0.13.49.bb | 9 | ||||
| -rw-r--r-- | recipes/zziplib/zziplib.inc | 11 | ||||
| -rw-r--r-- | recipes/zziplib/zziplib_0.13.49.bb | 5 |
4 files changed, 28 insertions, 20 deletions
diff --git a/recipes/zziplib/files/automake.patch b/recipes/zziplib/files/automake.patch new file mode 100644 index 0000000000..aeba741ae2 --- /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 index eb954f12c1..0000000000 --- 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 e0ef3f2e58..5951ed6e7d 100644 --- 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 3aecb74017..256b13dbba 100644 --- 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" |