[PATCH] use system stdlibs on Linux by default (fdo#45074, fdo#45696)

Petr Mladek pmladek at suse.cz
Fri Feb 10 05:58:29 PST 2012


The old system libraries breaked 3rd-party extensions.
There were also problems with exceptions hadnling.

We use pretty old compiler for the official build, so it should be compatible
with most systems. It is the preferred default also for other distro builds.
---
 configure.in                          |    6 +++---
 distro-configs/LibreOfficeLinux.conf  |    1 -
 distro-configs/OxygenOfficeLinux.conf |    2 --
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/configure.in b/configure.in
index 109bc7d..4667f0b 100644
--- a/configure.in
+++ b/configure.in
@@ -933,8 +933,8 @@ AC_ARG_WITH(system-jars,
 ,)
 
 AC_ARG_WITH(system-stdlibs,
-    AS_HELP_STRING([--with-system-stdlibs],
-        [Use libstdc++/libgcc_s already on system.]),,
+    AS_HELP_STRING([--without-system-stdlibs],
+        [Bundle the used libstdc++/libgcc_s into the installation set.]),,
     [with_system_stdlibs="$with_system_libs"])
 
 AC_ARG_WITH(system-cairo,
@@ -4653,7 +4653,7 @@ dnl ===================================================================
 dnl Check for system stdlibs
 dnl ===================================================================
 AC_MSG_CHECKING([whether to provide libstdc++/libgcc_s in the installset])
-if test "$with_system_stdlibs" = "yes"; then
+if test "$with_system_stdlibs" != "no"; then
     AC_MSG_RESULT([no])
     SYSTEM_STDLIBS=YES
 else
diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf
index 4b77cba..8f0b415 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -2,7 +2,6 @@
 --with-system-dicts
 --without-unix-wrapper
 --without-system-zlib
---without-system-stdlibs
 --without-system-poppler
 --without-system-openssl
 --without-system-mozilla
diff --git a/distro-configs/OxygenOfficeLinux.conf b/distro-configs/OxygenOfficeLinux.conf
index aacd3ba..b937f05 100644
--- a/distro-configs/OxygenOfficeLinux.conf
+++ b/distro-configs/OxygenOfficeLinux.conf
@@ -47,11 +47,9 @@
 --with-sun-templates
 --without-system-poppler
 --enable-neon
---without-system-stdlibs
 --with-jdk-home=/usr/local/jdk1.6.0_23/
 --without-system-dicts
 --without-system-zlib
---without-system-stdlibs
 --without-system-poppler
 --without-system-openssl
 --without-system-mozilla
-- 
1.7.3.4


--=-IOejmdPTrozhVkhpEHAd--



More information about the LibreOffice mailing list