From 35701ddafd918b48205d0cd48a3ddacb1ffc3ccd Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Thu, 17 Mar 2011 13:38:36 +0100 Subject: [PATCH] killing off stl in gbuild --- Repository.mk | 4 ---- RepositoryFixes.mk | 9 --------- solenv/gbuild/Helper.mk | 2 +- solenv/gbuild/gbuild.mk | 4 ---- solenv/gbuild/platform/linux.mk | 7 ------- solenv/gbuild/platform/macosx.mk | 7 ------- solenv/gbuild/platform/solaris.mk | 7 ------- solenv/gbuild/platform/windows.mk | 7 ------- solenv/gbuild/platform/winmingw.mk | 6 ------ 9 files changed, 1 insertion(+), 52 deletions(-) diff --git a/Repository.mk b/Repository.mk index 80e03cf55e49..123c4184b985 100644 --- a/Repository.mk +++ b/Repository.mk @@ -104,10 +104,6 @@ $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \ salhelper \ )) -$(eval $(call gb_Helper_register_libraries,STLLIBS, \ - stl \ -)) - $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ fsstorage \ hatchwindowfactory \ diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 7e1bae4ee916..4d26cccb6bba 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -38,8 +38,6 @@ gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salh gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES)) -gb_Library_FILENAMES := $(patsubst stl:%,stl:libstdc++.so,$(gb_Library_FILENAMES)) -gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS)) endif @@ -51,8 +49,6 @@ gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_ gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES)) -gb_Library_FILENAMES := $(patsubst stl:%,stl:libstdc++.dylib,$(gb_Library_FILENAMES)) -gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS)) endif @@ -92,8 +88,6 @@ gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_D gb_Library_DLLFILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES)) -gb_Library_FILENAMES := $(patsubst stl:%,stl:$(gb_Library_IARCSYSPRE)stdc++_s$(gb_Library_IARCSYSPRE),$(gb_Library_FILENAMES)) -gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS)) else gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES)) @@ -108,7 +102,6 @@ gb_Library_FILENAMES := $(patsubst tl:itl%,tl:itools%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES)) -gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprt%,$(gb_Library_FILENAMES)) gb_Library_NOILIBFILENAMES:=\ advapi32 \ gdi32 \ @@ -155,8 +148,6 @@ endif # we do not require a known rule for these, when using system libs -gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS)) - ifeq ($(SYSTEM_LIBXML),YES) gb_Library_TARGETS := $(filter-out xml2,$(gb_Library_TARGETS)) endif diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index f45094b9ba42..d16c7cd598ca 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -117,7 +117,7 @@ endef define gb_Helper_init_registries gb_Executable_VALIDGROUPS := UREBIN SDK OOO BRAND NONE -gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTLIBS RTVERLIBS STLLIBS UNOLIBS_URE UNOLIBS_OOO UNOVERLIBS +gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTLIBS RTVERLIBS UNOLIBS_URE UNOLIBS_OOO UNOVERLIBS gb_StaticLibrary_VALIDGROUPS := PLAINLIBS $$(foreach group,$$(gb_Executable_VALIDGROUPS),$$(eval gb_Executable_$$(group) :=)) diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index ad30ff7da4a6..5677d793af65 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -38,7 +38,6 @@ # PRODUCT # SOLARINC # SOLARLIB -# STLPORT_VER # UPD # GXX_INCLUDE_PATH (Linux) @@ -46,7 +45,6 @@ # SYSTEM_ICU (Linux) # SYSTEM_JPEG (Linux) # SYSTEM_LIBXML (Linux) -# USE_SYSTEM_STL (Linux) SHELL := /bin/sh true := T @@ -155,7 +153,6 @@ gb_GLOBALDEFS := \ -DENABLE_LAYOUT_EXPERIMENTAL=0 \ -DENABLE_LAYOUT=0 \ -DOSL_DEBUG_LEVEL=$(gb_DEBUGLEVEL) \ - -DSTLPORT_VERSION=$(STLPORT_VER) \ -DSUPD=$(UPD) \ -DVCL \ $(gb_OSDEFS) \ @@ -170,7 +167,6 @@ gb_GLOBALDEFS += \ else gb_GLOBALDEFS += \ -DDBG_UTIL \ - -D_STLP_DEBUG \ -D_DEBUG \ endif diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk index 1721f7d47201..231111e7061b 100755 --- a/solenv/gbuild/platform/linux.mk +++ b/solenv/gbuild/platform/linux.mk @@ -260,11 +260,6 @@ gb_Library_SYSPRE := lib gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_ gb_Library_PLAINEXT := .so gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT) -ifeq ($(gb_PRODUCT),$(true)) -gb_Library_STLEXT := port_gcc$(gb_Library_PLAINEXT) -else -gb_Library_STLEXT := port_gcc_stldebug$(gb_Library_PLAINEXT) -endif ifeq ($(CPUNAME),X86_64) gb_Library_OOOEXT := lx$(gb_Library_PLAINEXT) @@ -289,7 +284,6 @@ gb_Library_FILENAMES := \ $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \ $(foreach lib,$(gb_Library_RTLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \ $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \ - $(foreach lib,$(gb_Library_STLLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_STLEXT)) \ $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \ $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \ @@ -301,7 +295,6 @@ gb_Library_LAYER := \ $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \ $(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \ $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \ - $(foreach lib,$(gb_Library_STLLIBS),$(lib):URELIB) \ $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \ $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \ diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 4d7031446961..f6f3d9c0b637 100755 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -297,11 +297,6 @@ gb_Library_SYSPRE := lib gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_ gb_Library_PLAINEXT := .dylib gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT) -ifeq ($(gb_PRODUCT),$(true)) -gb_Library_STLEXT := port_gcc$(gb_Library_PLAINEXT) -else -gb_Library_STLEXT := port_gcc_stldebug$(gb_Library_PLAINEXT) -endif ifeq ($(CPUNAME),INTEL) gb_Library_OOOEXT := mxi$(gb_Library_PLAINEXT) @@ -329,7 +324,6 @@ gb_Library_FILENAMES := \ $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \ $(foreach lib,$(gb_Library_RTLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \ $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \ - $(foreach lib,$(gb_Library_STLLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_STLEXT)) \ $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \ $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \ @@ -341,7 +335,6 @@ gb_Library_LAYER := \ $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \ $(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \ $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \ - $(foreach lib,$(gb_Library_STLLIBS),$(lib):URELIB) \ $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \ $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \ diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 6845384f2b0c..a7b1b2968f6c 100755 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -227,11 +227,6 @@ gb_Library_SYSPRE := lib gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_ gb_Library_PLAINEXT := .so gb_Library_RTEXT := C52$(gb_Library_PLAINEXT) -ifeq ($(gb_PRODUCT),$(true)) -gb_Library_STLEXT := port_sunpro$(gb_Library_PLAINEXT) -else -gb_Library_STLEXT := port_sunpro_debug$(gb_Library_PLAINEXT) -endif ifeq ($(CPUNAME),INTEL) gb_Library_OOOEXT := si$(gb_Library_PLAINEXT) @@ -256,7 +251,6 @@ gb_Library_FILENAMES := \ $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \ $(foreach lib,$(gb_Library_RTLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \ $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \ - $(foreach lib,$(gb_Library_STLLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_STLEXT)) \ $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \ $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \ @@ -268,7 +262,6 @@ gb_Library_LAYER := \ $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \ $(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \ $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \ - $(foreach lib,$(gb_Library_STLLIBS),$(lib):URELIB) \ $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \ $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \ diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index cad5be5e09a0..a68d369ecf26 100755 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -458,7 +458,6 @@ gb_Library_LAYER := \ $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \ $(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \ $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):OOO) \ - $(foreach lib,$(gb_Library_STLLIBS),$(lib):OOO) \ $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):OOO) \ $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):OOO) \ @@ -469,11 +468,6 @@ gb_Library_FILENAMES :=\ gb_Library_DLLEXT := .dll gb_Library_MAJORVER := 3 gb_Library_RTEXT := MSC$(gb_Library_DLLEXT) -ifeq ($(gb_PRODUCT),$(true)) -gb_Library_STLEXT := port_vc7145$(gb_Library_DLLEXT) -else -gb_Library_STLEXT := port_vc7145_stldebug$(gb_Library_DLLEXT) -endif gb_Library_OOOEXT := mi$(gb_Library_DLLEXT) gb_Library_UNOEXT := .uno$(gb_Library_DLLEXT) gb_Library_UNOVEREXT := $(gb_Library_MAJORVER)$(gb_Library_DLLEXT) @@ -486,7 +480,6 @@ gb_Library_DLLFILENAMES :=\ $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(lib)$(gb_Library_DLLEXT)) \ $(foreach lib,$(gb_Library_RTLIBS),$(lib):$(lib)$(gb_Library_RTEXT)) \ $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(lib)$(gb_Library_RTVEREXT)) \ - $(foreach lib,$(gb_Library_STLLIBS),$(lib):$(lib)$(gb_Library_STLEXT)) \ $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \ $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(lib)$(gb_Library_UNOVEREXT)) \ diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk index d9e5ed828e3f..b7864983aa86 100644 --- a/solenv/gbuild/platform/winmingw.mk +++ b/solenv/gbuild/platform/winmingw.mk @@ -472,7 +472,6 @@ gb_Library_LAYER := \ $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \ $(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \ $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):OOO) \ - $(foreach lib,$(gb_Library_STLLIBS),$(lib):OOO) \ $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):OOO) \ $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):OOO) \ @@ -483,11 +482,6 @@ gb_Library_FILENAMES :=\ gb_Library_DLLEXT := .dll gb_Library_MAJORVER := 3 gb_Library_RTEXT := gcc3$(gb_Library_DLLEXT) -ifeq ($(gb_PRODUCT),$(true)) -gb_Library_STLEXT := port_gcc$(gb_Library_DLLEXT) -else -gb_Library_STLEXT := port_gcc_stldebug$(gb_Library_DLLEXT) -endif gb_Library_OOOEXT := gi$(gb_Library_DLLEXT) gb_Library_UNOEXT := .uno$(gb_Library_DLLEXT) gb_Library_UNOVEREXT := $(gb_Library_MAJORVER)$(gb_Library_DLLEXT)