clucene/patches/clucene-gcc-atomics.patch | 20 ++++++++++++++++++++ clucene/source/Makefile | 1 + 2 files changed, 21 insertions(+)
New commits: commit 419cceda368284743e8fcd873d7bec94423cc37c Author: Caolán McNamara <caol...@redhat.com> Date: Thu Feb 23 12:10:41 2012 +0000 use the same compiler test for atomics in clucene as sal diff --git a/clucene/patches/clucene-gcc-atomics.patch b/clucene/patches/clucene-gcc-atomics.patch new file mode 100644 index 0000000..d4b47b2 --- /dev/null +++ b/clucene/patches/clucene-gcc-atomics.patch @@ -0,0 +1,20 @@ +--- src/shared/CLucene/config/threads.cpp 2012-02-23 12:06:55.355506304 +0000 ++++ src/shared/CLucene/config/threads.cpp 2012-02-23 12:07:17.131766381 +0000 +@@ -185,7 +185,7 @@ + } + + int32_t atomic_threads::atomic_increment(_LUCENE_ATOMIC_INT *theInteger){ +- #ifdef _CL_HAVE_GCC_ATOMIC_FUNCTIONS ++ #if ( __GNUC__ > 4 ) || (( __GNUC__ == 4) && ( __GNUC_MINOR__ >= 4 )) + return __sync_add_and_fetch(theInteger, 1); + #else + SCOPED_LOCK_MUTEX(theInteger->THIS_LOCK) +@@ -193,7 +193,7 @@ + #endif + } + int32_t atomic_threads::atomic_decrement(_LUCENE_ATOMIC_INT *theInteger){ +- #ifdef _CL_HAVE_GCC_ATOMIC_FUNCTIONS ++ #if ( __GNUC__ > 4 ) || (( __GNUC__ == 4) && ( __GNUC_MINOR__ >= 4 )) + return __sync_sub_and_fetch(theInteger, 1); + #else + SCOPED_LOCK_MUTEX(theInteger->THIS_LOCK) diff --git a/clucene/source/Makefile b/clucene/source/Makefile index a53a47e..a4131df 100644 --- a/clucene/source/Makefile +++ b/clucene/source/Makefile @@ -41,6 +41,7 @@ done : $(GNUTAR) -x --strip-component=1 -f $(FIXED_TARFILE_LOCATION)/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz $(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 #FIXME ?, our rules expect .cxx for i in `find . -name "*.cpp"`; do mv $$i $${i%%cpp}cxx; done ifneq ($(OS),WNT)
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits