diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-11-07 00:01:38 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-11-07 00:02:03 +0200 |
| commit | 84d252489db5fec6d0aebc8e5a8619876ac42355 (patch) | |
| tree | 6ab0df33573da4a7d896ce66b3fcc7d431d436a6 /liblangtag | |
| parent | cd4e44ee7ad6d06b4d5378d9a986a3ce67886ba0 (diff) | |
Configury fixes for MSVC, avoid accidentally using -march=i486
Change-Id: I2c3083ce84872e415e61c61e41473a3da14ed88a
Diffstat (limited to 'liblangtag')
| -rw-r--r-- | liblangtag/liblangtag-0.4.0-windows.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/liblangtag/liblangtag-0.4.0-windows.patch b/liblangtag/liblangtag-0.4.0-windows.patch index 7e8ec41a655b..2e772016b536 100644 --- a/liblangtag/liblangtag-0.4.0-windows.patch +++ b/liblangtag/liblangtag-0.4.0-windows.patch @@ -1,5 +1,17 @@ --- misc/liblangtag-0.4.0/configure.ac +++ misc/build/liblangtag-0.4.0/configure.ac +@@ -173,8 +173,9 @@ + __sync_synchronize(); + j = __sync_fetch_and_sub(&i, 1); + return j; +- ]])], [AC_MSG_ERROR([liblangtag has to be built with -march=i486 or later.])] +- [lt_cv_has_atomic=no])]) ++ ]])], [AC_MSG_ERROR([liblangtag has to be built with -march=i486 or later.])], ++ [lt_cv_has_atomic=no ++ CFLAGS="$_save_cflags"])]) + ]) + if test "x$lt_cv_has_atomic" = "xyes"; then + AC_DEFINE(LT_HAVE_ATOMIC_BUILTINS, 1, [Have buit-in atomic functions]) @@ -291,8 +291,14 @@ dnl ====================================================================== dnl check another libraries @@ -18,6 +30,16 @@ if test "x$enable_introspection" != "xyes"; then --- misc/liblangtag-0.4.0/configure +++ misc/build/liblangtag-0.4.0/configure +@@ -12607,7 +12607,9 @@ + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : + as_fn_error $? "liblangtag has to be built with -march=i486 or later." "$LINENO" 5 ++else + lt_cv_has_atomic=no ++ CFLAGS="$_save_cflags" + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext @@ -13203,6 +13203,10 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu |