diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-04-12 16:05:31 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-04-13 13:15:25 +0100 |
| commit | 452af5f4522e750627d0c0ac9fbc794aeb1f1f8f (patch) | |
| tree | 950d062f9e183873d64b06e212568a3b0968bb58 /clucene | |
| parent | 99b04ed2be3023bec874fce529d453123f48ac99 (diff) | |
gbuildize internal zlib
and stick headers into the solver in the same hierarchy as is "standard"
so we don't have to patch so much, similiarly rename to libz
Diffstat (limited to 'clucene')
| -rw-r--r-- | clucene/CustomTarget_source.mk | 1 | ||||
| -rw-r--r-- | clucene/patches/clucene-internal-zlib.patch | 15 |
2 files changed, 0 insertions, 16 deletions
diff --git a/clucene/CustomTarget_source.mk b/clucene/CustomTarget_source.mk index 474d1b838a8e..a93b59560ec8 100644 --- a/clucene/CustomTarget_source.mk +++ b/clucene/CustomTarget_source.mk @@ -61,7 +61,6 @@ $(CLSO)/done : $(cl_FIXED_TARFILE_LOCATION) \ $(call gb_Helper_abbreviate_dirs, \ mkdir -p $(dir $@) && cd $(dir $@) && \ $(GNUTAR) -x -z $(STRIP_COMPONENTS)=1 -f $< && \ - $(GNUPATCH) -p0 < $(SRCDIR)/clucene/patches/clucene-internal-zlib.patch && \ $(GNUPATCH) -p0 < $(SRCDIR)/clucene/patches/clucene-warnings.patch && \ $(GNUPATCH) -p0 < $(SRCDIR)/clucene/patches/clucene-gcc-atomics.patch && \ $(GNUPATCH) -p0 < $(SRCDIR)/clucene/patches/clucene-debug.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> |