diff options
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, 16 insertions, 0 deletions
diff --git a/clucene/CustomTarget_source.mk b/clucene/CustomTarget_source.mk index a93b59560ec8..474d1b838a8e 100644 --- a/clucene/CustomTarget_source.mk +++ b/clucene/CustomTarget_source.mk @@ -61,6 +61,7 @@ $(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 new file mode 100644 index 000000000000..666792634456 --- /dev/null +++ b/clucene/patches/clucene-internal-zlib.patch @@ -0,0 +1,15 @@ +--- 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> |