diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2012-08-27 12:02:53 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-08-27 13:33:44 +0200 |
| commit | 6e7baaaba85b0d6cd86e959f9af229a0d30c01f8 (patch) | |
| tree | dbfbeed7e0134e2bc2f620c970b4358a3faa4fbe /icu | |
| parent | 8a55c4af62d90ff8518491a86a97bfe827591ece (diff) | |
fdo#53855: Use the newly added HAVE_GCC_BUILTIN_ATOMIC for icu
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>:
* pass -DU_HAVE_GCC_ATOMICS=1 in when applicable on MINGW, too
Change-Id: I2073c61fb92d698a3c1ba38266dbd0373b0a693c
Diffstat (limited to 'icu')
| -rw-r--r-- | icu/icu4c-interlck.patch | 11 | ||||
| -rw-r--r-- | icu/makefile.mk | 7 |
2 files changed, 5 insertions, 13 deletions
diff --git a/icu/icu4c-interlck.patch b/icu/icu4c-interlck.patch deleted file mode 100644 index 6426dce4dab4..000000000000 --- a/icu/icu4c-interlck.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- misc/icu/source/common/putilimp.h -+++ misc/build/icu/source/common/putilimp.h -@@ -175,7 +175,7 @@ - */ - #ifdef U_HAVE_GCC_ATOMICS - /* Use the predefined value. */ --#elif defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 401) -+#elif defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 404) - # define U_HAVE_GCC_ATOMICS 1 - #else - # define U_HAVE_GCC_ATOMICS 0 diff --git a/icu/makefile.mk b/icu/makefile.mk index e7fa92587651..7b990ab95a0d 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -58,7 +58,6 @@ PATCH_FILES=\ icu4c-warnings.patch \ icu4c.9313.cygwin.patch \ icu4c-macosx.patch \ - icu4c-interlck.patch \ icu4c-solarisgcc.patch \ .IF "$(OS)"=="ANDROID" @@ -69,6 +68,10 @@ PATCH_FILES+=\ icu4c-rpath.patch .ENDIF +.IF "$(HAVE_GCC_BUILTIN_ATOMIC)"=="TRUE" +EXTRA_CDEFS+=-DU_HAVE_GCC_ATOMICS=1 +.ENDIF + .IF "$(GUI)"=="UNX" .IF "$(SYSBASE)"!="" @@ -236,7 +239,7 @@ BUILD_AND_HOST=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-cross-bu BUILD_AND_HOST=--build=i586-pc-mingw32 --enable-64bit-libs=no .ENDIF -CONFIGURE_ACTION+=sh -c 'CFLAGS="-O -D_MT" CXXFLAGS="-O -D_MT" LDFLAGS="$(icu_LDFLAGS)" LIBS="$(icu_LIBS)" \ +CONFIGURE_ACTION+=sh -c 'CPPFLAGS="$(EXTRA_CDEFS)" CFLAGS="-O -D_MT" CXXFLAGS="-O -D_MT" LDFLAGS="$(icu_LDFLAGS)" LIBS="$(icu_LIBS)" \ ./configure $(BUILD_AND_HOST) --enable-layout --disable-static --enable-shared --disable-samples' CONFIGURE_FLAGS= |