clucene/UnpackedTarball_clucene.mk | 1 clucene/configs/_clucene-config-LINUX.h | 4 +- clucene/configs/_clucene-config-MSVC.h | 4 +- clucene/configs/_clucene-config-generic.h | 4 +- clucene/configs/clucene-config-GCC-atomic.h | 4 +- clucene/configs/clucene-config-MINGW-atomic.h | 4 +- clucene/configs/clucene-config-MINGW.h | 4 +- clucene/configs/clucene-config-MSVC.h | 4 +- clucene/configs/clucene-config-generic.h | 4 +- clucene/patches/clucene-libcpp.patch | 42 ++++++++++++++++++++++++++ include/rtl/allocator.hxx | 2 - 11 files changed, 68 insertions(+), 9 deletions(-)
New commits: commit 64670c3ea25b0f8c8975946971b041b71f362066 Author: Tor Lillqvist <[email protected]> Date: Thu May 9 19:08:09 2013 +0300 HAVE_CXX11_PERFECT_FORWARDING doesn't seem to work against libc++ (Just one small fix for building against libc++, an unknown amount of more difficult issues left to solve.) Change-Id: I9789b8d76aa214558ab4baad823b6650ebc640d3 diff --git a/include/rtl/allocator.hxx b/include/rtl/allocator.hxx index 05575c2..710e2fe 100644 --- a/include/rtl/allocator.hxx +++ b/include/rtl/allocator.hxx @@ -127,7 +127,7 @@ public: } //----------------------------------------- -#if HAVE_CXX11_PERFECT_FORWARDING +#if HAVE_CXX11_PERFECT_FORWARDING && !defined(_LIBCPP_VERSION) template< typename... Args > void construct (pointer p, Args &&... value) { commit b71f9cdab150109edc8269a523b87f471b2baaf4 Author: Tor Lillqvist <[email protected]> Date: Thu May 9 18:26:16 2013 +0300 Make clucene build against libc++ (at least the one in Xcode 4.6) (Note that we don't build successfully against libc++ currently; this is just a fix for the first issue that I came across when trying.) Change-Id: If8b594177434e96a8b51c372b26a72236b9b5f5e diff --git a/clucene/UnpackedTarball_clucene.mk b/clucene/UnpackedTarball_clucene.mk index ed3c900..bc11f6d 100644 --- a/clucene/UnpackedTarball_clucene.mk +++ b/clucene/UnpackedTarball_clucene.mk @@ -24,6 +24,7 @@ $(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-libcpp.patch \ clucene/patches/clucene-multimap-put.patch \ clucene/patches/clucene-narrowing-conversions.patch \ clucene/patches/clucene-nullptr.patch \ diff --git a/clucene/patches/clucene-libcpp.patch b/clucene/patches/clucene-libcpp.patch new file mode 100644 index 0000000..3523521 --- /dev/null +++ b/clucene/patches/clucene-libcpp.patch @@ -0,0 +1,42 @@ +--- src/shared/CLucene/LuceneThreads.h ++++ src/shared/CLucene/LuceneThreads.h +@@ -7,6 +7,7 @@ + #ifndef _LuceneThreads_h + #define _LuceneThreads_h + ++#include "CLucene/config/_threads.h" + + CL_NS_DEF(util) + class CLuceneThreadIdCompare; +--- src/core/CLucene/util/VoidMap.h ++++ src/core/CLucene/util/VoidMap.h +@@ -11,8 +11,13 @@ + #include "CLucene/LuceneThreads.h" + + #if defined(_CL_HAVE_TR1_UNORDERED_MAP) && defined(_CL_HAVE_TR1_UNORDERED_SET) ++#ifdef _LIBCPP_VERSION ++ #include <unordered_map> ++ #include <unordered_set> ++#else + #include <tr1/unordered_map> + #include <tr1/unordered_set> ++#endif + #elif defined(_CL_HAVE_HASH_MAP) && defined(_CL_HAVE_HASH_SET) + //hashing is all or nothing! + #include <hash_map> +--- src/shared/CLucene/config/repl_tchar.h ++++ src/shared/CLucene/config/repl_tchar.h +@@ -36,8 +36,13 @@ + #define _tcsncpy wcsncpy //copy a specified amount of one string to another string. + #define _tcscat wcscat //copy a string onto the end of the other string + #define _tcsncat wcsncat ++#if defined(_LIBCPP_VERSION) && defined(__APPLE__) ++ #define _tcschr ::wcschr //find location of one character ++ #define _tcsstr ::wcsstr //find location of a string ++#else + #define _tcschr wcschr //find location of one character + #define _tcsstr wcsstr //find location of a string ++#endif + #define _tcslen wcslen //get length of a string + #define _tcscmp wcscmp //case sensitive compare two strings + #define _tcsncmp wcsncmp //case sensitive compare two strings commit 39f8b887202fcf3037a80960e6a8e70af756aa64 Author: Tor Lillqvist <[email protected]> Date: Thu May 9 17:27:25 2013 +0300 Identify the origin of these files Makes it more obvious where the file comes from if looking at one as it has been copied into the UnpackedTarball/clucene tree. Change-Id: I31cd24e64fd6ce3cf262c8509842ecc4425e1b1a diff --git a/clucene/configs/_clucene-config-LINUX.h b/clucene/configs/_clucene-config-LINUX.h index afea55c..2b425b6 100644 --- a/clucene/configs/_clucene-config-LINUX.h +++ b/clucene/configs/_clucene-config-LINUX.h @@ -2,7 +2,9 @@ #define _SRC_CLUCENE_INTERNAL_CLUCENE_CONFIG_H 1 /* src/shared/CLucene/_clucene-config.h. -* Generated automatically at end of cmake. +* Normally generated automatically at end of cmake, +* but here in LibreOffice this actually is a copy of +* clucene/configs/_clucene-config-LINUX.h. * These are internal definitions, and this file does not need to be distributed */ diff --git a/clucene/configs/_clucene-config-MSVC.h b/clucene/configs/_clucene-config-MSVC.h index aa8a93c..09ef41c 100644 --- a/clucene/configs/_clucene-config-MSVC.h +++ b/clucene/configs/_clucene-config-MSVC.h @@ -2,7 +2,9 @@ #define _SRC_CLUCENE_INTERNAL_CLUCENE_CONFIG_H 1 /* src/shared/CLucene/_clucene-config.h. -* Generated automatically at end of cmake. +* Normally generated automatically at end of cmake, +* but here in LibreOffice this actually is a copy of +* clucene/configs/_clucene-config-MSVC.h. * These are internal definitions, and this file does not need to be distributed */ diff --git a/clucene/configs/_clucene-config-generic.h b/clucene/configs/_clucene-config-generic.h index a9fb331..42cf27c 100644 --- a/clucene/configs/_clucene-config-generic.h +++ b/clucene/configs/_clucene-config-generic.h @@ -2,7 +2,9 @@ #define _SRC_CLUCENE_INTERNAL_CLUCENE_CONFIG_H 1 /* src/shared/CLucene/_clucene-config.h. -* Generated automatically at end of cmake. +* Normally generated automatically at end of cmake, +* but here in LibreOffice this actually is a copy of +* clucene/configs/_clucene-config-generic.h. * These are internal definitions, and this file does not need to be distributed */ diff --git a/clucene/configs/clucene-config-GCC-atomic.h b/clucene/configs/clucene-config-GCC-atomic.h index 4dc8390..3c034a1 100644 --- a/clucene/configs/clucene-config-GCC-atomic.h +++ b/clucene/configs/clucene-config-GCC-atomic.h @@ -2,7 +2,9 @@ #define _SRC_CLUCENE_CLUCENE_CONFIG_H 1 /* src/shared/CLucene/clucene-config.h. -* Generated automatically at end of cmake. +* Normally generated automatically at end of cmake, +* but here in LibreOffice this actually is a copy of +* clucene/configs/clucene-config-GCC-atomic.h. */ /* CMake will look for these headers: */ diff --git a/clucene/configs/clucene-config-MINGW-atomic.h b/clucene/configs/clucene-config-MINGW-atomic.h index a75b98b..4b77b69 100644 --- a/clucene/configs/clucene-config-MINGW-atomic.h +++ b/clucene/configs/clucene-config-MINGW-atomic.h @@ -2,7 +2,9 @@ #define _SRC_CLUCENE_CLUCENE_CONFIG_H 1 /* src/shared/CLucene/clucene-config.h. -* Generated automatically at end of cmake. +* Normally generated automatically at end of cmake, +* but here in LibreOffice this actually is a copy of +* clucene/configs/clucene-config-MINGW-atomic.h. */ /* CMake will look for these headers: */ diff --git a/clucene/configs/clucene-config-MINGW.h b/clucene/configs/clucene-config-MINGW.h index be6f487..009505e 100644 --- a/clucene/configs/clucene-config-MINGW.h +++ b/clucene/configs/clucene-config-MINGW.h @@ -2,7 +2,9 @@ #define _SRC_CLUCENE_CLUCENE_CONFIG_H 1 /* src/shared/CLucene/clucene-config.h. -* Generated automatically at end of cmake. +* Normally generated automatically at end of cmake, +* but here in LibreOffice this actually is a copy of +* clucene/configs/clucene-config-MINGW.h. */ /* CMake will look for these headers: */ diff --git a/clucene/configs/clucene-config-MSVC.h b/clucene/configs/clucene-config-MSVC.h index da7d37f..edd4a3b 100644 --- a/clucene/configs/clucene-config-MSVC.h +++ b/clucene/configs/clucene-config-MSVC.h @@ -2,7 +2,9 @@ #define _SRC_CLUCENE_CLUCENE_CONFIG_H 1 /* src/shared/CLucene/clucene-config.h. -* Generated automatically at end of cmake. +* Normally generated automatically at end of cmake, +* but here in LibreOffice this actually is a copy of +* clucene/configs/clucene-config-MSVC.h. */ /* CMake will look for these headers: */ diff --git a/clucene/configs/clucene-config-generic.h b/clucene/configs/clucene-config-generic.h index b69ba5b..b84dd4b 100644 --- a/clucene/configs/clucene-config-generic.h +++ b/clucene/configs/clucene-config-generic.h @@ -2,7 +2,9 @@ #define _SRC_CLUCENE_CLUCENE_CONFIG_H 1 /* src/shared/CLucene/clucene-config.h. -* Generated automatically at end of cmake. +* Normally generated automatically at end of cmake, +* but here in LibreOffice this actually is a copy of +* clucene/configs/clucene-config-generic.h. */ /* CMake will look for these headers: */ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
