You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by tr...@apache.org on 2020/08/26 05:08:03 UTC
[openoffice] branch AOO418 updated: i104495 - libstdc++ removal.
This is an automated email from the ASF dual-hosted git repository.
truckman pushed a commit to branch AOO418
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO418 by this push:
new 07cb168 i104495 - libstdc++ removal.
07cb168 is described below
commit 07cb168e39e3222dcab8b8ce75d6fed4c00ec170
Author: pfg <pf...@13f79535-47bb-0310-9956-ffa450edef68>
AuthorDate: Mon Jan 16 22:25:07 2017 +0000
i104495 - libstdc++ removal.
This cleanup was meant for KDE4 integration: in the BSDs this is dead code
and it doesn't seem a good idea on linux either, plus carrying libstdc++
doesn't align with ASF policies.
git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1779119 13f79535-47bb-0310-9956-ffa450edef68
---
main/external/gcc3_specific/makefile.mk | 88 ---------------------------------
main/external/prj/build.lst | 1 -
main/scp2/source/ooo/ure.scp | 22 ---------
main/solenv/inc/settings.mk | 3 --
main/solenv/inc/target.mk | 4 --
main/solenv/inc/tg_compv.mk | 32 ------------
main/ure/source/README | 8 ++-
main/ure/source/uretest/Makefile | 8 +--
main/ure/source/uretest/Makefile.pln | 9 ++--
main/ure/source/uretest/README | 10 ----
10 files changed, 11 insertions(+), 174 deletions(-)
diff --git a/main/external/gcc3_specific/makefile.mk b/main/external/gcc3_specific/makefile.mk
deleted file mode 100644
index cd21ef2..0000000
--- a/main/external/gcc3_specific/makefile.mk
+++ /dev/null
@@ -1,88 +0,0 @@
-# *************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# *************************************************************
-PRJ=..
-PRJNAME=external
-TARGET=gcc3_specific
-
-# ------------------------------------------------------------------
-.INCLUDE: settings.mk
-# ------------------------------------------------------------------
-
-
-.IF "$(BUILD_SPECIAL)"==""
-
-.IF "$(GUI)" == "WNT"
-
-.IF "$(COM)" == "GCC"
-
-.IF "$(MINGW_SHARED_GCCLIB)" == "YES"
-MINGWGCCDLL=$(BIN)$/$(MINGW_GCCDLL)
-.ENDIF
-
-.IF "$(MINGW_SHARED_GXXLIB)" == "YES"
-MINGWGXXDLL=$(BIN)$/$(MINGW_GXXDLL)
-.ENDIF
-
-all : $(BIN)$/mingwm10.dll $(MINGWGCCDLL) $(MINGWGXXDLL)
-
-$(BIN)$/mingwm10.dll :
- $(COPY) -p $(COMPATH)$/bin$/mingwm10.dll $(BIN)$/
-
-.IF "$(MINGW_SHARED_GCCLIB)" == "YES"
-$(MINGWGCCDLL) :
- $(COPY) -p $(COMPATH)$/bin$/$(MINGW_GCCDLL) $(BIN)$/
-.ENDIF
-
-.IF "$(MINGW_SHARED_GXXLIB)" == "YES"
-$(MINGWGXXDLL) :
- $(COPY) -p $(COMPATH)$/bin$/$(MINGW_GXXDLL) $(BIN)$/
-.ENDIF
-
-.ENDIF
-
-.ELSE
-
-.IF "$(SYSTEM_STDLIBS)" != "YES" && "$(COMID)"=="gcc3"
-
-.IF "$(OS)"!="MACOSX"
-.IF "$(OS)"!="OS2"
-
-.EXPORT : CC
-
-all .SEQUENTIAL : $(LB)$/libstdc++.so.$(SHORTSTDCPP3) $(LB)$/libgcc_s.so.$(SHORTSTDC3)
-
-
-$(LB)$/libstdc++.so.$(SHORTSTDCPP3) :
- $(GCCINSTLIB) libstdc++.so.$(SHORTSTDCPP3) $(LB)
-
-$(LB)$/libgcc_s.so.$(SHORTSTDC3) :
- $(GCCINSTLIB) libgcc_s.so.$(SHORTSTDC3) $(LB)
-
-.ENDIF
-.ENDIF
-.ENDIF
-
-.ENDIF
-.ENDIF # "$(BUILD_SPECIAL)"==""
-
-
-.INCLUDE: target.mk
-
diff --git a/main/external/prj/build.lst b/main/external/prj/build.lst
index 5620441..ccf60b1 100644
--- a/main/external/prj/build.lst
+++ b/main/external/prj/build.lst
@@ -1,4 +1,3 @@
el external : soltools NULL
el external usr1 - all el_mkout NULL
-el external\gcc3_specific nmake - all el_gcc3 NULL
el external\mingwheaders nmake - w el_mingwheaders NULL
diff --git a/main/scp2/source/ooo/ure.scp b/main/scp2/source/ooo/ure.scp
index 5263b27..a4399d6 100644
--- a/main/scp2/source/ooo/ure.scp
+++ b/main/scp2/source/ooo/ure.scp
@@ -823,26 +823,6 @@ File gid_File_Dl_Libxml2
End
#endif
-#if defined _gcc3 && !(defined NETBSD \
- || defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || defined(OS2))
-File gid_File_Dl_GccS
- TXT_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_VER("gcc_s", STRING(SHORTSTDC3));
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-End
-#endif
-
-#if defined _gcc3 && !(defined NETBSD \
- || defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || defined(OS2))
-File gid_File_Dl_Stdcpp
- Dir = SCP2_URE_DL_DIR;
- TXT_FILE_BODY;
- Name = SCP2_URE_DL_VER("stdc++", STRING(SHORTSTDCPP3));
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-End
-#endif
-
#if (defined WNT && defined _gcc3)
File gid_File_Lib_Mingwm10_Ure
TXT_FILE_BODY;
@@ -1032,8 +1012,6 @@ Module gid_Module_Root_Ure_Hidden
gid_File_Dl_Textoutstream,
gid_File_Dl_Uuresolver,
gid_File_Dl_Libxml2,
- gid_File_Dl_GccS,
- gid_File_Dl_Stdcpp,
gid_File_Lib_Mingw_GccS_Ure,
gid_File_Lib_Mingw_Stdcpp_Ure,
gid_File_Lib_Mingwm10_Ure,
diff --git a/main/solenv/inc/settings.mk b/main/solenv/inc/settings.mk
index efc2099..00a45d2 100644
--- a/main/solenv/inc/settings.mk
+++ b/main/solenv/inc/settings.mk
@@ -866,9 +866,6 @@ SCPDEFS+=-DUDK_MAJOR=$(UDK_MAJOR)
SCPDEFS+=-U$(COMID) -DCOMID=$(COMID) -DCOMNAME=$(COMNAME) -D_$(COMID)
SCPDEFS+=-DCCNUMVER=$(CCNUMVER)
-.IF "$(COM)"=="GCC"
-SCPDEFS+=-DSHORTSTDCPP3=$(SHORTSTDCPP3) -DSHORTSTDC3=$(SHORTSTDC3)
-.ENDIF # "$(SHORTSTDCPP3)"!=""
# extend library path for OS/2 gcc/wlink
.IF "$(GUI)"=="OS2"
LIB:=$(LB);$(SLB);$(ILIB)
diff --git a/main/solenv/inc/target.mk b/main/solenv/inc/target.mk
index 4f20b5d..0641096 100644
--- a/main/solenv/inc/target.mk
+++ b/main/solenv/inc/target.mk
@@ -1434,10 +1434,6 @@ COMPVTMP:=$(mktmp iii)
.IF "$(CCNUMVER)"!=""
@echo COMNAME:=$(COMNAME) > $(COMPVTMP)
@echo COMID:=$(COMID) >> $(COMPVTMP)
-.IF "$(COM)"=="GCC"
- @echo SHORTSTDCPP3:=$(SHORTSTDCPP3) >> $(COMPVTMP)
- @echo SHORTSTDC3:=$(SHORTSTDC3) >> $(COMPVTMP)
-.ENDIF
@echo CCNUMVER:=$(CCNUMVER) >> $(COMPVTMP)
@echo CCVER:=$(CCVER:s/-/ /:1) >> $(COMPVTMP)
@echo CDEFS+=-DCPPU_ENV=$(COMNAME) >> $(COMPVTMP)
diff --git a/main/solenv/inc/tg_compv.mk b/main/solenv/inc/tg_compv.mk
index a3466d0..f820a35 100644
--- a/main/solenv/inc/tg_compv.mk
+++ b/main/solenv/inc/tg_compv.mk
@@ -78,9 +78,6 @@ COMNAME=msci
.IF "$(COM)"=="GCC"
-SHORTSTDCPP3:=
-SHORTSTDC3:="1"
-
.IF "$(CCNUMVER)">="000200910000"
COMID=GCC
COMNAME=gcc2
@@ -91,35 +88,6 @@ COMNAME=gcc2
COMID=gcc3
COMNAME=gcc3
-.IF "$(CCNUMVER)">="000300000001"
-SHORTSTDCPP3="3"
-.ENDIF
-
-.IF "$(CCNUMVER)">="000300010000"
-SHORTSTDCPP3="4"
-.ENDIF
-
-.IF "$(CCNUMVER)">="000300020000"
-SHORTSTDCPP3="5"
-.ENDIF
-
-.IF "$(CCNUMVER)">="000300040000"
-.IF "$(OS)$(CPU)" == "LINUX6" || "$(OS)$(CPU)" == "LINUXH"
-#for gcc >= 3.4.0 on m68k-linux this is libgcc_s.so.2.
-#for gcc >= 3.4.0 < 4.2.0 on hppa-linux this is libgcc_s.so.2.
-SHORTSTDC3:="2"
-.ENDIF
-SHORTSTDCPP3="6"
-.ENDIF
-
-.IF "$(CCNUMVER)">="000400020000"
-.IF "$(OS)$(CPU)" == "LINUXH"
-#for gcc >= 4.2.0 on hppa-linux this is libgcc_s.so.4.
-SHORTSTDC3:="4"
-.ENDIF
-SHORTSTDCPP3="6"
-.ENDIF
-
.ENDIF
.ENDIF
diff --git a/main/ure/source/README b/main/ure/source/README
index ed99198..41f6bfa 100644
--- a/main/ure/source/README
+++ b/main/ure/source/README
@@ -50,8 +50,6 @@ Linux x86, Solaris x86, and Solaris SPARC:
/opt/openoffice.org/ure/share/misc/types.rdb
/opt/openoffice.org/ure/share/misc/services.rdb
/opt/openoffice.org/ure/lib/libxml2.so.2 [external]
-/opt/openoffice.org/ure/lib/libgcc_s.so.1 [external; Linux x86 only]
-/opt/openoffice.org/ure/lib/libstdc++.so.6 [external; Linux x86 only]
/opt/openoffice.org/ure/bin/startup.sh [private]
/opt/openoffice.org/ure/bin/uno.bin [private]
/opt/openoffice.org/ure/bin/regcomp.bin [private]
@@ -345,9 +343,9 @@ GNU Compiler Collection on Linux x86
------------------------------------
On Linux x86, the URE uses libgcc_s.so.1 to run binary UNO components that were
-compiled with the GNU Compiler Collection (GCC). The libgcc_s.so.1 corresponds
-to GCC 3.4.1 as built on a glibc 2.2.4 system. To avoid GCC compatibility
-issues, use the same GCC version (or later) when you compile the UNO binaries.
+compiled with the GNU Compiler Collection (GCC), to GCC 3.4.1 as
+built on a glibc 2.2.4 system. To avoid GCC compatibility issues, use the same
+GCC version (or later) when you compile the UNO binaries.
Otherwise, use LD_PRELOAD to replace the libgcc_s.so.1 in URE with a matching
version.
diff --git a/main/ure/source/uretest/Makefile b/main/ure/source/uretest/Makefile
index ed11027..9fb428b 100644
--- a/main/ure/source/uretest/Makefile
+++ b/main/ure/source/uretest/Makefile
@@ -62,7 +62,7 @@ test: test-cpptest test-javatest test-javanative test-clientserver
.PHONY: test-cpptest
test-cpptest: out.sdk/cppmain.uno.$(SHAREDLIB_EXT) out.sdk/types.rdb \
out.sdk/services.rdb
- $(GCCS_COMPAT) uno \
+ uno \
-c test.cpp.cppmain.Component -l $(URLPREFIX)$(cwd)/$< \
-ro "$(subst \,/,$(URLPREFIX)$(URE_TYPES))" -ro out.sdk/types.rdb \
-ro "$(subst \,/,$(URLPREFIX)$(URE_SERVICES))" \
@@ -70,7 +70,7 @@ test-cpptest: out.sdk/cppmain.uno.$(SHAREDLIB_EXT) out.sdk/types.rdb \
.PHONY: test-javatest
test-javatest: out.sdk/javamain.uno.jar out.sdk/types.rdb out.sdk/services.rdb
- $(GCCS_COMPAT) uno \
+ uno \
-c test.java.javamain.Component -l $(URLPREFIX)$(cwd)/$< \
-ro "$(subst \,/,$(URLPREFIX)$(URE_TYPES))" -ro out.sdk/types.rdb \
-ro "$(subst \,/,$(URLPREFIX)$(URE_SERVICES))" \
@@ -79,11 +79,11 @@ test-javatest: out.sdk/javamain.uno.jar out.sdk/types.rdb out.sdk/services.rdb
.PHONY: test-javanative
test-javanative: out.sdk/runner.jar out.sdk/javanative.jar \
out.sdk/javanative.rc out.sdk/services.rdb out.sdk/types.rdb
- $(GCCS_COMPAT) $(SDK_JAVA) -jar out.sdk/runner.jar $(ure_java_url)/ \
+ $(SDK_JAVA) -jar out.sdk/runner.jar $(ure_java_url)/ \
$(URLPREFIX)$(cwd)/out.sdk/javanative.jar \
$(URLPREFIX)$(cwd)/out.sdk/javanative.rc
-do_server = $(GCCS_COMPAT) uno -c test.cpp.cppserver.Component \
+do_server = uno -c test.cpp.cppserver.Component \
-l $(URLPREFIX)$(cwd)/out.sdk/cppserver.uno.$(SHAREDLIB_EXT) \
-ro "$(subst \,/,$(URLPREFIX)$(URE_TYPES))" -ro out.sdk/types.rdb \
-ro "$(subst \,/,$(URLPREFIX)$(URE_SERVICES))" -ro out.sdk/services.rdb \
diff --git a/main/ure/source/uretest/Makefile.pln b/main/ure/source/uretest/Makefile.pln
index 5868d73..3b42a61 100644
--- a/main/ure/source/uretest/Makefile.pln
+++ b/main/ure/source/uretest/Makefile.pln
@@ -25,7 +25,6 @@
# The following variables can be set, if necessary (see README):
#URE_HOME := /opt/openoffice.org/ure
#GXX_INCLUDE_PATH := /usr/include/g++
-#GCCS_COMPAT := LD_PRELOAD=/lib/libgcc_s.so.1
URE_HOME ?= /opt/openoffice.org/ure
@@ -43,14 +42,14 @@ test-regview: out.pln/services.rdb
.PHONY: test-cpptest
test-cpptest: out.pln/cppmain.uno.so out.pln/types.rdb out.pln/services.rdb
- $(GCCS_COMPAT) $(URE_HOME)/bin/uno \
+ $(URE_HOME)/bin/uno \
-c test.cpp.cppmain.Component -l file://$(PWD)/$< \
-ro $(URE_HOME)/share/misc/types.rdb -ro out.pln/types.rdb \
-ro $(URE_HOME)/share/misc/services.rdb -ro out.pln/services.rdb
.PHONY: test-javatest
test-javatest: out.pln/javamain.uno.jar out.pln/types.rdb out.pln/services.rdb
- $(GCCS_COMPAT) $(URE_HOME)/bin/uno \
+ $(URE_HOME)/bin/uno \
-c test.java.javamain.Component -l file://$(PWD)/$< \
-ro $(URE_HOME)/share/misc/types.rdb -ro out.pln/types.rdb \
-ro $(URE_HOME)/share/misc/services.rdb -ro out.pln/services.rdb
@@ -58,7 +57,7 @@ test-javatest: out.pln/javamain.uno.jar out.pln/types.rdb out.pln/services.rdb
.PHONY: test-javanative
test-javanative: out.pln/runner.jar out.pln/javanative.jar \
out.pln/javanative.rc out.pln/services.rdb out.pln/types.rdb
- $(GCCS_COMPAT) LD_LIBRARY_PATH=$(URE_HOME)/lib java \
+ LD_LIBRARY_PATH=$(URE_HOME)/lib java \
-jar out.pln/runner.jar file://$(URE_HOME)/share/java/ \
file://$(PWD)/out.pln/javanative.jar \
file://$(PWD)/out.pln/javanative.rc
@@ -66,7 +65,7 @@ test-javanative: out.pln/runner.jar out.pln/javanative.jar \
.PHONY: test-clientserver
test-clientserver: out.pln/cppserver.uno.so out.pln/runner.jar \
out.pln/javaclient.jar
- $(GCCS_COMPAT) $(URE_HOME)/bin/uno -c test.cpp.cppserver.Component \
+ $(URE_HOME)/bin/uno -c test.cpp.cppserver.Component \
-l file://$(PWD)/out.pln/cppserver.uno.so \
-ro $(URE_HOME)/share/misc/types.rdb -ro out.pln/types.rdb \
-ro $(URE_HOME)/share/misc/services.rdb \
diff --git a/main/ure/source/uretest/README b/main/ure/source/uretest/README
index 95d45cc..9419691 100644
--- a/main/ure/source/uretest/README
+++ b/main/ure/source/uretest/README
@@ -33,11 +33,6 @@ Before you execute Makefile, you need to configure the Software Development Kit
For more information, read the .../docs/install.html file in the SDK
installation.
-NOTE: On Linux x86, if the Makefile accesses a GCC that is incompatible with the
-GCC that was used to build the URE, use the GCCS_COMPAT environment variable as
-a workaround. For more details, see the UDK README file.
-
-
Makefile.pln
------------
@@ -62,11 +57,6 @@ Overwrites the default URE location, that is, /opt/openoffice.org/ure.
Overwrites the default location of the GCC C++ headers (/usr/include/g++). This
information is needed by the STLport included in the URE.
-- GCCS_COMPAT (optional)
-Fixes incompatibility issues between the GCC that was used to build the URE and
-the GCC that Makefile.pln accesses. For more details, see the UDK README file.
-
-
Tests
-----