[Libreoffice-commits] .: 3 commits - liblangtag/liblangtag-0.4.0-windows.patch liblangtag/makefile.mk

[Libreoffice Gerrit user]

 liblangtag/liblangtag-0.4.0-windows.patch |   24 +++++++++++++++++++++++-
 liblangtag/makefile.mk                    |    1 +
 2 files changed, 24 insertions(+), 1 deletion(-)

New commits:
commit 5886b37b986ee6882537117a137bd29c06ac4163
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed Nov 7 00:06:13 2012 +0200

    Make sure -MD is used with MSVC (use the MSVCRT runtime)
    
    Change-Id: I864e45b6925fa35d4b75c9214b799f664a5c1247

diff --git a/liblangtag/makefile.mk b/liblangtag/makefile.mk
index 85a57bc..b60e38a 100644
--- a/liblangtag/makefile.mk
+++ b/liblangtag/makefile.mk
@@ -68,6 +68,7 @@ CONFIGURE_FLAGS+= --disable-introspection
 CONFIGURE_FLAGS+= LIBXML2_CFLAGS='-I$(SOLARINCDIR)/external'
 .IF "$(GUI)"=="WNT" && "$(COM)"!="GCC"
 CONFIGURE_FLAGS+= LIBXML2_LIBS='$(SOLARLIBDIR)/libxml2.lib'
+CC:=$(CC) -MD
 .ELSE
 CONFIGURE_FLAGS+= LIBXML2_LIBS='-L$(SOLARLIBDIR) -lxml2'
 .ENDIF
commit 28c1c143ab7e306cd1e6a7efe6e13a02c7ac15da
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed Nov 7 00:02:38 2012 +0200

    Use HAVE_STDINT_H instead of _MSC_VER
    
    Change-Id: I921f5adc72bb0c83389f74659127c4512fc93738

diff --git a/liblangtag/liblangtag-0.4.0-windows.patch b/liblangtag/liblangtag-0.4.0-windows.patch
index 2e77201..30b3a0c 100644
--- a/liblangtag/liblangtag-0.4.0-windows.patch
+++ b/liblangtag/liblangtag-0.4.0-windows.patch
@@ -303,7 +303,7 @@
  #include <langinfo.h>
 +#endif
  #include <locale.h>
-+#ifdef _MSC_VER
++#ifndef HAVE_STDINT_H
 +typedef int int32_t;
 +#else
  #include <stdint.h>
commit 84d252489db5fec6d0aebc8e5a8619876ac42355
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed Nov 7 00:01:38 2012 +0200

    Configury fixes for MSVC, avoid accidentally using -march=i486
    
    Change-Id: I2c3083ce84872e415e61c61e41473a3da14ed88a

diff --git a/liblangtag/liblangtag-0.4.0-windows.patch b/liblangtag/liblangtag-0.4.0-windows.patch
index 7e8ec41..2e77201 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