diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2012-08-27 11:49:36 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-08-27 13:33:44 +0200 |
| commit | 8a55c4af62d90ff8518491a86a97bfe827591ece (patch) | |
| tree | 9e857db9f238e81f7fc460870277397c3cb48541 /clucene/UnpackedTarball_clucene.mk | |
| parent | 8474c6af652343777653e6ac8115b994b54ff853 (diff) | |
fdo#53855: Use the newly added HAVE_GCC_BUILTIN_ATOMIC for clucene
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>:
* added clucene-config-MINGW-atomic.h, to not lose _CL_HAVE_GCC_ATOMIC_FUNCTIONS
when applicable there
* renamed clucene-config-GCC.h to clucene-config-GCC-atomic.h for consistency
with above
Change-Id: I3dd15721b568fa9358b79ec28bad39249200c773
Diffstat (limited to 'clucene/UnpackedTarball_clucene.mk')
| -rw-r--r-- | clucene/UnpackedTarball_clucene.mk | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/clucene/UnpackedTarball_clucene.mk b/clucene/UnpackedTarball_clucene.mk index de974da9ebc2..d7ecfc764e4d 100644 --- a/clucene/UnpackedTarball_clucene.mk +++ b/clucene/UnpackedTarball_clucene.mk @@ -26,7 +26,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-gcc-atomics.patch \ clucene/patches/clucene-internal-zlib.patch \ clucene/patches/clucene-multimap-put.patch \ clucene/patches/clucene-narrowing-conversions.patch \ @@ -39,10 +38,18 @@ $(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/_clucene-co ifeq ($(COM),MSC) $(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/clucene-config.h,clucene/configs/clucene-config-MSVC.h)) else +ifeq ($(HAVE_GCC_BUILTIN_ATOMIC),TRUE) +$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/clucene-config.h,clucene/configs/clucene-config-MINGW-atomic.h)) +else $(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/clucene-config.h,clucene/configs/clucene-config-MINGW.h)) endif +endif else # ! $(OS),WNT +ifeq ($(HAVE_GCC_BUILTIN_ATOMIC),TRUE) +$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/clucene-config.h,clucene/configs/clucene-config-GCC-atomic.h)) +else $(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/clucene-config.h,clucene/configs/clucene-config-generic.h)) +endif ifeq ($(OS),LINUX) $(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/_clucene-config.h,clucene/configs/_clucene-config-LINUX.h)) else |