[Libreoffice-commits] .: 3 commits - berkeleydb/makefile.mk berkeleydb/prj curl/makefile.mk graphite/graphite-2.3.1.patch graphite/makefile.mk graphite/prj neon/prj nss/makefile.mk nss/prj

Fridrich Strba fridrich at kemper.freedesktop.org
Wed Feb 9 11:24:41 PST 2011 

 berkeleydb/makefile.mk        |    5 +----
 berkeleydb/prj/build.lst      |    2 +-
 curl/makefile.mk              |    5 -----
 graphite/graphite-2.3.1.patch |    2 +-
 graphite/makefile.mk          |   12 +-----------
 graphite/prj/build.lst        |    2 +-
 neon/prj/build.lst            |    2 +-
 nss/makefile.mk               |    3 ---
 nss/prj/build.lst             |    2 +-
 9 files changed, 7 insertions(+), 28 deletions(-)

New commits:
commit 6a1cb3932cc5372f0a36a298a3e0fa05f76bf5da
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Feb 9 16:20:19 2011 +0100

    Trying to remove the stlport mention from the code

diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk
index dc5cbad..4cba974 100644
--- a/berkeleydb/makefile.mk
+++ b/berkeleydb/makefile.mk
@@ -135,7 +135,7 @@ db_LIBS=
 CFLAGS+=-D_GLIBCXX_DLL
 db_LIBS+=-lstdc++_s
 .ENDIF
-db_LIBXSO_LIBS=$(LIBSTLPORT) $(db_LIBS)
+db_LIBXSO_LIBS=$(db_LIBS)
 .IF "$(MINGW_SHARED_GCCLIB)"=="YES"
 db_LIBXSO_LIBS+=-lgcc_s
 .ENDIF
@@ -156,9 +156,6 @@ OUT2INC= \
 .ENDIF
 
 .ELSE
-# make use of stlport headerfiles
-EXT_USE_STLPORT=TRUE
-
 BUILD_DIR=
 BUILD_ACTION=dmake
 
diff --git a/curl/makefile.mk b/curl/makefile.mk
index 8e95621..7323446 100644
--- a/curl/makefile.mk
+++ b/curl/makefile.mk
@@ -112,8 +112,6 @@ BUILD_ACTION=make
 OUT2BIN=$(BUILD_DIR)$/.libs$/libcurl*.dll
 OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl*.a
 .ELSE
-# make use of stlport headerfiles
-EXT_USE_STLPORT=TRUE
 
 .IF "$(CCNUMVER)" > "001399999999"
 EXCFLAGS="/EHa /Zc:wchar_t- /D "_CRT_SECURE_NO_DEPRECATE""
@@ -142,9 +140,6 @@ OUT2LIB=$(BUILD_DIR)$/libcurl.lib
 .ENDIF			# "$(GUI)"=="WNT"
 
 .IF "$(GUI)"=="OS2"
-# make use of stlport headerfiles
-EXT_USE_STLPORT=TRUE
-
 BUILD_DIR=.$/lib
 .IF "$(debug)"==""
 BUILD_ACTION=make -f Makefile.os2
diff --git a/graphite/graphite-2.3.1.patch b/graphite/graphite-2.3.1.patch
index 934eb8e..c15edb7 100644
--- a/graphite/graphite-2.3.1.patch
+++ b/graphite/graphite-2.3.1.patch
@@ -66,7 +66,7 @@
 +### HDU: disabled building with the normal compile flags
 +###CPPFLAGS= /Zc:wchar_t- /nologo /W4 /GR /EHsc /I "./src/font" /I "./src/painter" /I "./src/segment" /I "./src/textsource" /I "./src/generic" /I "./include/graphite" /I "../wrappers/win32" /D "GR_NAMESPACE" /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /D "TRACING"  /Fp"$(INTDIR)\graphite.pch" /Fd"$(INTDIR)\\" /FD /c
 +### HDU: because for full binary compatibility with the rest of OOo all compile flags must match exactly
-+###       which is especially true for template-heavy C++ code with non-default config (e.g. _STLP_DEBUG enabled)
++###       which is especially true for template-heavy C++ code with non-default config (e.g. _DEBUG_RUNTIME enabled)
 +CPPFLAGS= $(CFLAGS4MSC) /nologo /W4 /I "./src/font" /I "./src/painter" /I "./src/segment" /I "./src/textsource" /I "./src/generic" /I "./include/graphite" /I "../wrappers/win32" /D "GR_NAMESPACE" /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /D "TRACING"  /Fp"$(INTDIR)\graphite.pch" /FD /c
 +
  # /Wp62
diff --git a/nss/makefile.mk b/nss/makefile.mk
index 67e01c5..61c5296 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -146,9 +146,6 @@ PATH!:=$(moz_build)/msys/bin:$(moz_build)/moztools/bin:$(PATH)
 OS_TARGET=WIN95
 .EXPORT : OS_TARGET
 
-# make use of stlport headerfiles
-EXT_USE_STLPORT=TRUE
-
 #To build nss one has to call "make nss_build_all" in 
 #mozilla/security/nss
 NSS_BUILD_DIR= $(subst,\,/ $(PWD)/$(MISC)/build/$(TARFILE_ROOTDIR)/mozilla/security/nss)
commit 2a7bdce3ba0ec8c94f41733112e2d27fbffebc17
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Feb 9 10:50:44 2011 +0100

    Removing the ext_std masterpiece

diff --git a/graphite/makefile.mk b/graphite/makefile.mk
index 4aeb626..1da1d14 100644
--- a/graphite/makefile.mk
+++ b/graphite/makefile.mk
@@ -68,8 +68,6 @@ VCNUM=7
 .ELSE
 VCNUM=8
 .ENDIF
-# make use of stlport headerfiles
-EXT_USE_STLPORT=TRUE
 BUILD_ACTION=nmake VERBOSE=1
 .IF "$(debug)"!=""
 BUILD_FLAGS= "CFG=DEBUG"
@@ -97,14 +95,6 @@ GR_CONFIGURE_FLAGS= --enable-final=yes --enable-static --disable-shared
 .ENDIF
 EXTRA_GR_CXX_FLAGS=-fPIC
 
-.IF "$(USE_SYSTEM_STL)"!="YES"
-# #i112124# STLPort seems to require libstdc++
-EXTRA_GR_LD_FLAGS=$(LIBSTLPORT) -lm -lstdc++
-GR_LIB_PATH=LD_LIBRARY_PATH=$(SOLARVERSION)/$(INPATH)/lib$(UPDMINOREXT)
-.ELSE
-GR_LIB_PATH=
-.ENDIF
-
 .IF "$(OS)"=="WNT"
 PATCH_FILES+=graphite-2.3.1.patch.mingw
 EXTRA_GR_CXX_FLAGS=-mthreads -nostdinc
@@ -116,7 +106,7 @@ EXTRA_GR_LD_FLAGS+=-no-undefined -Wl,--enable-runtime-pseudo-reloc-v2
 
 # don't use SOLARLIB for LDFLAGS because it pulls in system graphite so build will fail
 # 
-CONFIGURE_ACTION=bash -c 'CXXFLAGS="$(INCLUDE) $(CFLAGSCXX) $(CFLAGSCOBJ) $(CDEFS) $(CDEFSOBJ) $(SOLARINC) $(LFS_CFLAGS) $(EXTRA_GR_CXX_FLAGS)" $(GR_LIB_PATH) LDFLAGS="-L$(SOLARVERSION)/$(INPATH)/lib$(UPDMINOREXT) $(EXTRA_GR_LD_FLAGS)" ./configure $(GR_CONFIGURE_FLAGS)'
+CONFIGURE_ACTION=bash -c 'CXXFLAGS="$(INCLUDE) $(CFLAGSCXX) $(CFLAGSCOBJ) $(CDEFS) $(CDEFSOBJ) $(SOLARINC) $(LFS_CFLAGS) $(EXTRA_GR_CXX_FLAGS)" LDFLAGS="-L$(SOLARVERSION)/$(INPATH)/lib$(UPDMINOREXT) $(EXTRA_GR_LD_FLAGS)" ./configure $(GR_CONFIGURE_FLAGS)'
 .ENDIF
 
 BUILD_DIR=$(CONFIGURE_DIR)
commit a132079289979626ef29258f816be848ca795bc3
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Feb 9 04:26:58 2011 +0100

    Make stlport only optional dependency of postprocess

diff --git a/berkeleydb/prj/build.lst b/berkeleydb/prj/build.lst
index c74e15e..55a7bf1 100644
--- a/berkeleydb/prj/build.lst
+++ b/berkeleydb/prj/build.lst
@@ -1,3 +1,3 @@
-db      berkeleydb      :    external stlport NULL
+db      berkeleydb      :    external NULL
 db	berkeleydb						nmake	-	u	as_mkout NULL
 db	berkeleydb						nmake	-	w,vc7	as_mkout NULL
diff --git a/graphite/prj/build.lst b/graphite/prj/build.lst
index b409ff4..cefb762 100644
--- a/graphite/prj/build.lst
+++ b/graphite/prj/build.lst
@@ -1,3 +1,3 @@
-gr	graphite	:	stlport solenv NULL
+gr	graphite	:	solenv NULL
 gr	graphite		usr1	-	all	gr_mkout NULL
 gr	graphite		nmake	-	all	gr_graphite NULL
diff --git a/neon/prj/build.lst b/neon/prj/build.lst
index a9786c7..5803dc6 100755
--- a/neon/prj/build.lst
+++ b/neon/prj/build.lst
@@ -1,3 +1,3 @@
-xh      neon  :  OPENSSL:openssl ZLIB:zlib stlport soltools external EXPAT:expat LIBXML2:libxml2 NULL
+xh      neon  :  OPENSSL:openssl ZLIB:zlib soltools external EXPAT:expat LIBXML2:libxml2 NULL
 xh      neon     usr1           -       all     xh_mkout NULL
 xh      neon     nmake          -       all     xh_neon NULL
diff --git a/nss/prj/build.lst b/nss/prj/build.lst
index 1465b16..14963ff 100644
--- a/nss/prj/build.lst
+++ b/nss/prj/build.lst
@@ -1,3 +1,3 @@
-ns	nss	: solenv stlport NULL
+ns	nss	: solenv NULL
 ns	nss						nmake	-	usr1	ns_mkout NULL
 ns	nss						nmake	-	all	ns_nss NULL

More information about the Libreoffice-commits mailing list