[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - distro-configs/LibreOfficeLinux.conf distro-configs/OxygenOfficeLinux.conf external/gcc3_specific scp2/prj scp2/source scp2/util setup_native/source
Petr Mladek
pmladek at kemper.freedesktop.org
Wed Feb 22 06:19:02 PST 2012
distro-configs/LibreOfficeLinux.conf | 1
distro-configs/OxygenOfficeLinux.conf | 1
external/gcc3_specific/makefile.mk | 2
scp2/prj/build.lst | 3 -
scp2/source/ooo/ure.scp | 30 -------------
scp2/source/stdlibs/file_stdlibs.scp | 58 ++++++++++++++++++++++++++
scp2/source/stdlibs/makefile.mk | 52 +++++++++++++++++++++++
scp2/source/stdlibs/module_stdlibs.scp | 47 +++++++++++++++++++++
scp2/source/stdlibs/module_stdlibs.ulf | 32 ++++++++++++++
scp2/util/makefile.mk | 5 ++
setup_native/source/packinfo/packinfo_ure.txt | 12 +++++
11 files changed, 211 insertions(+), 32 deletions(-)
New commits:
commit e59ae28a2c3ae8a5f2e3e2547fd879bb6217dcfc
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Wed Feb 22 10:12:42 2012 +0100
Put stdlibs into separate optional package on Linux
Signed-off-by: Petr Mladek <pmladek at suse.cz>
diff --git a/scp2/prj/build.lst b/scp2/prj/build.lst
index b26c07d..9b82432 100644
--- a/scp2/prj/build.lst
+++ b/scp2/prj/build.lst
@@ -20,10 +20,11 @@ cp scp2\source\python nmake - all cp_python cp_langmacros c
cp scp2\source\quickstart nmake - all cp_quickstart cp_langmacros cp_langtemplates NULL
cp scp2\source\sdkoo nmake - all cp_sdkoo cp_langmacros cp_langtemplates NULL
cp scp2\source\smoketest nmake - all cp_smoketest cp_langmacros cp_langtemplates NULL
+cp scp2\source\stdlibs nmake - all cp_stdlibs cp_langmacros cp_langtemplates NULL
cp scp2\source\writer nmake - all cp_writer cp_langmacros cp_langtemplates NULL
cp scp2\source\base nmake - all cp_base cp_langmacros cp_langtemplates NULL
cp scp2\source\xsltfilter nmake - all cp_xsltfilter cp_langmacros cp_langtemplates NULL
cp scp2\source\winexplorerext nmake - all cp_winexplorerext cp_langmacros cp_langtemplates NULL
cp scp2\source\onlineupdate nmake - all cp_update cp_langmacros cp_langtemplates NULL
cp scp2\source\accessories nmake - all cp_accessories cp_langmacros NULL
-cp scp2\util nmake - all cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_math cp_ooo cp_python cp_quickstart cp_smoketest cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update cp_accessories NULL
+cp scp2\util nmake - all cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_math cp_ooo cp_python cp_quickstart cp_smoketest cp_stdlibs cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update cp_accessories NULL
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index be2418f..006e001 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -880,36 +880,6 @@ File gid_File_Dl_Stlport
End
#endif
-#if defined _gcc3 && !(defined FREEBSD || defined NETBSD || defined OPENBSD \
- || defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || defined(DRAGONFLY))
-File gid_File_Dl_GccS
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
-#ifdef AIX
- Name = "libgcc_s.a";
-#else
- Name = SCP2_URE_DL_VER("gcc_s", STRING(SHORTSTDC3));
-#endif
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- // CompID = "C601D04B-2194-4F1B-BB09-7B4930D6E1DB";
-End
-#endif
-
-#if defined _gcc3 && !(defined FREEBSD || defined NETBSD || defined OPENBSD \
- || defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || defined(DRAGONFLY))
-File gid_File_Dl_Stdcpp
- Dir = SCP2_URE_DL_DIR;
- LIB_FILE_BODY;
-#ifdef AIX
- Name = "libstdc++.a";
-#else
- Name = SCP2_URE_DL_VER("stdc++", STRING(SHORTSTDCPP3));
-#endif
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- // CompID = "89740D6A-38EE-41AF-A6A2-A8F7ABBE4996";
-End
-#endif
-
#if defined(WNT) && defined( _gcc3 )
#if defined(MINGW_GCCDLL)
diff --git a/scp2/source/stdlibs/file_stdlibs.scp b/scp2/source/stdlibs/file_stdlibs.scp
new file mode 100644
index 0000000..f1bd590
--- /dev/null
+++ b/scp2/source/stdlibs/file_stdlibs.scp
@@ -0,0 +1,58 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * Fridrich Strba <fridrich.strba at bluewin.ch> (initial developer)
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "macros.inc"
+
+#if defined _gcc3 && !(defined FREEBSD || defined NETBSD || defined OPENBSD \
+ || defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || defined(DRAGONFLY))
+File gid_File_Dl_GccS
+ LIB_FILE_BODY;
+ Dir = SCP2_URE_DL_DIR;
+#ifdef AIX
+ Name = "libgcc_s.a";
+#else
+ Name = SCP2_URE_DL_VER("gcc_s", STRING(SHORTSTDC3));
+#endif
+ Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+ // CompID = "C601D04B-2194-4F1B-BB09-7B4930D6E1DB";
+End
+#endif
+
+#if defined _gcc3 && !(defined FREEBSD || defined NETBSD || defined OPENBSD \
+ || defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || defined(DRAGONFLY))
+File gid_File_Dl_Stdcpp
+ Dir = SCP2_URE_DL_DIR;
+ LIB_FILE_BODY;
+#ifdef AIX
+ Name = "libstdc++.a";
+#else
+ Name = SCP2_URE_DL_VER("stdc++", STRING(SHORTSTDCPP3));
+#endif
+ Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+ // CompID = "89740D6A-38EE-41AF-A6A2-A8F7ABBE4996";
+End
+#endif
diff --git a/scp2/source/stdlibs/makefile.mk b/scp2/source/stdlibs/makefile.mk
new file mode 100644
index 0000000..3040025
--- /dev/null
+++ b/scp2/source/stdlibs/makefile.mk
@@ -0,0 +1,52 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Petr Mladek <pmladek at suse.cz> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+
+PRJ=..$/..
+
+PRJNAME=scp2
+TARGET=stdlibs
+TARGETTYPE=CUI
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+SCP_PRODUCT_TYPE=osl
+
+.IF "$(SYSTEM_STDLIBS)" != "YES"
+
+PARFILES = \
+ module_stdlibs.par \
+ file_stdlibs.par
+
+ULFFILES= \
+ module_stdlibs.ulf
+
+.ENDIF
+
+# --- File ---------------------------------------------------------
+
+.INCLUDE : target.mk
diff --git a/scp2/source/stdlibs/module_stdlibs.scp b/scp2/source/stdlibs/module_stdlibs.scp
new file mode 100644
index 0000000..f938f85
--- /dev/null
+++ b/scp2/source/stdlibs/module_stdlibs.scp
@@ -0,0 +1,47 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * Petr Mladek <pmladek at suse.cz> (initial developer)
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "macros.inc"
+
+Module gid_Module_Optional_Stdlibs
+ ParentID = gid_Module_Root;
+ Default = NO;
+ PackageInfo = "packinfo_ure.txt";
+ MOD_NAME_DESC(MODULE_OPTIONAL_STDLIBS);
+#ifdef UNX
+ Styles = ();
+#else
+ Styles = (DONTSHOWINUSERINSTALL);
+#endif
+ Files = (
+#if defined _gcc3 && !(defined FREEBSD || defined NETBSD || defined OPENBSD \
+ || defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || defined(DRAGONFLY))
+ gid_File_Dl_GccS,
+ gid_File_Dl_Stdcpp
+#endif
+ );
+End
diff --git a/scp2/source/stdlibs/module_stdlibs.ulf b/scp2/source/stdlibs/module_stdlibs.ulf
new file mode 100644
index 0000000..e29bbe4
--- /dev/null
+++ b/scp2/source/stdlibs/module_stdlibs.ulf
@@ -0,0 +1,32 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * Petr Mladek <pmladek at suse.cz> (initial developer)
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+[STR_NAME_MODULE_OPTIONAL_STDLIBS]
+en-US = "Standard Compiler Libraries"
+
+[STR_DESC_MODULE_OPTIONAL_STDLIBS]
+en-US = "libstdc++ and libgcc_s for too old Linux systems."
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
index 8c818fe..0c5efd4 100644
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@ -106,6 +106,11 @@ SCP1FILES += \
module_font_accessories.par \
file_font_accessories.par
.ENDIF
+.IF "$(SYSTEM_STDLIBS)" != "YES"
+SCP1FILES += \
+ module_stdlibs.par \
+ file_stdlibs.par
+.ENDIF
SCP1FILES += \
ure_into_ooo.par \
ure.par \
diff --git a/setup_native/source/packinfo/packinfo_ure.txt b/setup_native/source/packinfo/packinfo_ure.txt
index a6c3435..094937f 100755
--- a/setup_native/source/packinfo/packinfo_ure.txt
+++ b/setup_native/source/packinfo/packinfo_ure.txt
@@ -50,3 +50,15 @@ description = "UNO Runtime Environment"
destpath = "/opt"
packageversion = "%UREPACKAGEVERSION"
End
+
+Start
+module = "gid_Module_Optional_Stdlibs"
+solarispackagename = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs"
+packagename = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs"
+copyright = "2012 by LibreOffice"
+solariscopyright = "solariscopyrightfile"
+vendor = "The Document Foundation"
+description = "libstdc++ and libgcc_s for too old Linux systems"
+destpath = "/opt"
+packageversion = "%UREPACKAGEVERSION"
+End
commit 4b3703e6c31daf2c7cfe485169232a3ae0c3dac8
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Wed Feb 22 09:25:20 2012 +0100
Bundle again C++ stdlibs with generic Linux build
Signed-off-by: Petr Mladek <pmladek at suse.cz>
diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf
index 8f0b415..4b77cba 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -2,6 +2,7 @@
--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 b937f05..d3d5496 100644
--- a/distro-configs/OxygenOfficeLinux.conf
+++ b/distro-configs/OxygenOfficeLinux.conf
@@ -50,6 +50,7 @@
--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
diff --git a/external/gcc3_specific/makefile.mk b/external/gcc3_specific/makefile.mk
index b6211c4..501acfa 100644
--- a/external/gcc3_specific/makefile.mk
+++ b/external/gcc3_specific/makefile.mk
@@ -6,7 +6,7 @@ TARGET=gcc3_specific
.INCLUDE: settings.mk
# ------------------------------------------------------------------
-.IF "$(COMID)"=="gcc3"
+.IF "$(SYSTEM_STDLIBS)" != "YES" && "$(COMID)"=="gcc3"
.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" && "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" && "$(OS)"!="OPENBSD" && "$(OS)"!="DRAGONFLY"
More information about the Libreoffice-commits
mailing list