7c0606c942
since the -march=i486 is not supported on PPC, all further compile checks done in liblangtag's configure break. So moving the corresponding patch out of the windows patch in a generic one and also apply that for Mac. Change-Id: I65716bc9d7ff19976e5e82ae869c7594978e93e3 Reviewed-on: https://gerrit.libreoffice.org/999 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
62 lines
1.9 KiB
Diff
62 lines
1.9 KiB
Diff
--- 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
|
|
dnl ======================================================================
|
|
+case $host_os in
|
|
+ cygwin* | mingw*)
|
|
+ ;;
|
|
-AX_PTHREAD([],
|
|
+ *)
|
|
+ AX_PTHREAD([],
|
|
[AC_MSG_ERROR([*** pthread library are required])])
|
|
+ ;;
|
|
+esac
|
|
|
|
GOBJECT_INTROSPECTION_CHECK([1.30.0])
|
|
if test "x$enable_introspection" != "xyes"; then
|
|
--- misc/liblangtag-0.4.0/configure
|
|
+++ misc/build/liblangtag-0.4.0/configure
|
|
@@ -12604,7 +12604,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
|
|
@@ -13201,6 +13201,10 @@
|
|
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
|
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|
|
|
+case $host_os in
|
|
+ cygwin* | mingw*)
|
|
+ ;;
|
|
+ *)
|
|
ax_pthread_ok=no
|
|
|
|
# We used to check for pthread.h first, but this fails if pthread.h
|
|
@@ -13582,6 +13582,8 @@
|
|
ax_pthread_ok=no
|
|
as_fn_error $? "*** pthread library are required" "$LINENO" 5
|
|
fi
|
|
+;;
|
|
+esac
|
|
ac_ext=c
|
|
ac_cpp='$CPP $CPPFLAGS'
|
|
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|