diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-02-19 10:04:59 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-02-19 09:44:37 +0000 |
| commit | 4465624e770155a60c6e4ac10ac87429a039b37f (patch) | |
| tree | f02a86786abd6c8d2a05f6b2bb1fb4794cf75772 /setup_native | |
| parent | 3432c63c0cdcdfe3e74702c16ce6c746d9c0fdf4 (diff) | |
Kill the --without-system-stdlibs option
(cherry picked from commit 3708fe8434ad6f64d527215f4619556b0a5701ff)
Conflicts:
external/Module_external.mk
scp2/Module_scp2.mk
Change-Id: I54bff2c8593995829857d30b38b8626a8c1a1a4f
Reviewed-on: https://gerrit.libreoffice.org/2252
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'setup_native')
| -rw-r--r-- | setup_native/source/packinfo/packinfo_ure.txt | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/setup_native/source/packinfo/packinfo_ure.txt b/setup_native/source/packinfo/packinfo_ure.txt index 49c659112ae9..dfa037510252 100644 --- a/setup_native/source/packinfo/packinfo_ure.txt +++ b/setup_native/source/packinfo/packinfo_ure.txt @@ -20,6 +20,8 @@ Start module = "gid_Module_Root" solarispackagename = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure" solarisrequires = "SUNWzlibr" +solarisprovides = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs" +provides = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs" packagename = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure" copyright = "2012 The Document Foundation" solariscopyright = "solariscopyrightfile" @@ -33,6 +35,8 @@ Start module = "gid_Module_Root_Ure_Hidden" solarispackagename = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure" solarisrequires = "SUNWzlibr" +solarisprovides = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs" +provides = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs" packagename = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure" copyright = "2012 The Document Foundation" solariscopyright = "solariscopyrightfile" @@ -41,15 +45,3 @@ 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 The Document Foundation" -solariscopyright = "solariscopyrightfile" -vendor = "The Document Foundation" -description = "libstdc++ and libgcc_s for too old Linux systems" -destpath = "/opt" -packageversion = "%UREPACKAGEVERSION" -End |