diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-05-08 15:47:24 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-05-08 23:34:26 +0200 |
| commit | 3c38b7727a3deab37c5e9b822cec53c081e2b6e3 (patch) | |
| tree | 61b40e23ba463a235d7bc41028630a068f3c4fe2 /clucene | |
| parent | e567baf92c0fc71e862a2cf07e029576ee36cd77 (diff) | |
zlib: remove ExternalPackage_zlib
Change-Id: I5bce88b2044279a6563fd68c35f9c1ac824c8850
Diffstat (limited to 'clucene')
| -rw-r--r-- | clucene/UnpackedTarball_clucene.mk | 1 | ||||
| -rw-r--r-- | clucene/patches/clucene-internal-zlib.patch | 15 |
2 files changed, 0 insertions, 16 deletions
diff --git a/clucene/UnpackedTarball_clucene.mk b/clucene/UnpackedTarball_clucene.mk index 6a326984b5ad..ed3c900cdd84 100644 --- a/clucene/UnpackedTarball_clucene.mk +++ b/clucene/UnpackedTarball_clucene.mk @@ -24,7 +24,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,clucene,0)) # http://sourceforge.net/mailarchive/message.php?msg_id=29143260 $(eval $(call gb_UnpackedTarball_add_patches,clucene,\ clucene/patches/clucene-debug.patch \ - clucene/patches/clucene-internal-zlib.patch \ clucene/patches/clucene-multimap-put.patch \ clucene/patches/clucene-narrowing-conversions.patch \ clucene/patches/clucene-nullptr.patch \ diff --git a/clucene/patches/clucene-internal-zlib.patch b/clucene/patches/clucene-internal-zlib.patch deleted file mode 100644 index 666792634456..000000000000 --- a/clucene/patches/clucene-internal-zlib.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- src/shared/CLucene/util/Misc.cpp 2012-02-17 15:33:09.217891100 +0000 -+++ src/shared/CLucene/util/Misc.cpp 2012-02-17 15:38:10.836597500 +0000 -@@ -34,7 +34,11 @@ - #include "CLucene/util/dirent.h" //if we have dirent, then the native one will be used - - //for zlib... --#include "zlib.h" -+#ifdef SYSTEM_ZLIB -+#include <zlib.h> -+#else -+#include <external/zlib/zlib.h> -+#endif - #if defined(MSDOS) || defined(OS2) || defined(WIN32) || defined(__CYGWIN__) - # include <fcntl.h> - # include <io.h> |