Fix build of the optional stdlibs package on Linux

8 files changed, 196 insertions, 61 deletions

diff --git a/scp2/prj/build.lst b/scp2/prj/build.lst
index b26c07d798ba..9b8243240874 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/makefile.mk b/scp2/source/ooo/makefile.mk
index 08ba316e2b96..244cf558d9df 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -328,7 +328,6 @@ PARFILES=                          \
         profile_ooo.par            \
         profileitem_ooo.par        \
         ure.par                    \
-        stdlib.par                 \
         ure_into_ooo.par           \
         ure_standalone.par         \
         common_brand.par           \
diff --git a/scp2/source/ooo/stdlib.scp b/scp2/source/ooo/stdlib.scp
deleted file mode 100644
index 700b35b10063..000000000000
--- a/scp2/source/ooo/stdlib.scp
+++ /dev/null
@@ -1,59 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#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/file_stdlibs.scp b/scp2/source/stdlibs/file_stdlibs.scp
new file mode 100644
index 000000000000..f1bd5903336c
--- /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@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 000000000000..3040025cabd3
--- /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@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 000000000000..f938f85914b1
--- /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@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 000000000000..e29bbe4de76a
--- /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@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 7de0c6c0dd32..4cd31f5872cc 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                       \