[Libreoffice-commits] .: 2 commits - cppunit/makefile.mk cppunit/prj icc/prj libtextcat/prj libwpd/prj libxmlsec/prj np_sdk/prj redland/prj
Fridrich Strba
fridrich at kemper.freedesktop.org
Wed Feb 9 11:24:37 PST 2011
cppunit/makefile.mk | 66 ++++-------------------------------------------
cppunit/prj/build.lst | 2 -
icc/prj/build.lst | 2 -
libtextcat/prj/build.lst | 2 -
libwpd/prj/build.lst | 2 -
libxmlsec/prj/build.lst | 2 -
np_sdk/prj/build.lst | 2 -
redland/prj/build.lst | 2 -
8 files changed, 13 insertions(+), 67 deletions(-)
New commits:
commit e596e4a9b54485fafe314ae0832e29df3bdc114a
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Wed Feb 9 10:50:40 2011 +0100
Removing the ext_std masterpiece
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index 448d905..7c4d548 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -75,27 +75,14 @@ $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE): ooo-cppunit_dll.mk ooo-DllPlugInTester.mk
EXTRA_CFLAGS += -mthreads
LDFLAGS += -Wl,--enable-runtime-pseudo-reloc-v2
-.IF "$(USE_SYSTEM_STL)" != "YES"
-
-OOO_STLPORT_CXXFLAGS = -I$(SOLARINCDIR)/stl
-.IF "$(USE_STLP_DEBUG)" == "TRUE"
-OOO_STLPORT_CXXFLAGS += -D_STLP_DEBUG
-.END
-OOO_STLPORT_CXXFLAGS += -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH)
-
-OOO_STLPORT_LDFLAGS = -L$(SOLARLIBDIR)
-OOO_STLPORT_LIBS = $(LIBSTLPORT)
-
-.END
-
CONFIGURE_ACTION = ./configure
CONFIGURE_FLAGS = --prefix=$(shell cd $(PACKAGE_DIR) && \
pwd $(PWDFLAGS))/$(TARFILE_ROOTDIR)/ooo-install \
--disable-dependency-tracking --disable-static --disable-doxygen \
--disable-html-docs --disable-latex-docs CC='$(CC)' CXX='$(CXX)' \
- CXXFLAGS='$(EXTRA_CFLAGS) $(OOO_STLPORT_CXXFLAGS)' \
- LDFLAGS='$(LDFLAGS) $(OOO_STLPORT_LDFLAGS)' \
- LIBS='$(OOO_STLPORT_LIBS) $(MY_LIBS)'
+ CXXFLAGS='$(EXTRA_CFLAGS)' \
+ LDFLAGS='$(LDFLAGS)' \
+ LIBS='$(MY_LIBS)'
BUILD_ACTION = $(GNUMAKE)
BUILD_FLAGS = install
@@ -114,47 +101,6 @@ OUT2BIN = ooo-install/bin/DllPlugInTester.exe \
.ELSE
-.IF "$(USE_SYSTEM_STL)" != "YES"
-
-OOO_STLPORT_CXXFLAGS = -I$(SOLARINCDIR)/stl
-.IF "$(USE_STLP_DEBUG)" == "TRUE"
-OOO_STLPORT_CXXFLAGS += -D_STLP_DEBUG
-.END
-.IF "$(COM)" == "GCC"
-OOO_STLPORT_CXXFLAGS += -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH)
-.END
-
-OOO_STLPORT_LDFLAGS = -L$(SOLARLIBDIR)
-OOO_STLPORT_LIBS = $(LIBSTLPORT)
-
-# When "checking for C compiler default output file name" configure
-# unfortunately uses "$CC $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS" to build
-# a C program that links against $(LIBSTLPORT); at least on one unxlngi6
-# machine, this has been observed to fail with "/lib/libm.so.6: undefined
-# reference to `_rtld_global_ro at GLIBC_PRIVATE'" unless -lm is also specified:
-.IF "$(OS)" == "LINUX" && "$(COM)" == "GCC" && "$(CPU)" == "I"
-OOO_STLPORT_LIBS += -lm
-# #i112124# furthermore, STLPort seems to require libstdc++
-OOO_STLPORT_LIBS += -lstdc++
-.END
-
-# And later, when "checking whether the C compiler works" configure tries to
-# execute that program; however, the program would fail to locate the STLport
-# library (another work-around might be to add something like --as-needed around
-# $(LIBSTLPORT)):
-.IF "$(OS)" == "FREEBSD" || "$(OS)" == "LINUX" || "$(OS)" == "SOLARIS" || "$(OS)" == "OPENBSD"
-.IF "$(LD_LIBRARY_PATH)" == ""
-LD_LIBRARY_PATH := $(SOLARLIBDIR)
- # strictly speaking, this is incorrect if the LD_LIBRARY_PATH environment
- # variable is set to the empty string
-.ELSE
-LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(SOLARLIBDIR)
-.END
-.EXPORT: LD_LIBRARY_PATH
-.END
-
-.END
-
# At least on Solaris with Sun CC, linking the cppunit dynamic library fails as
# TestAssert.o uses fabs but -lm is missing from the command line (cppunit's
# aclocal.m4 contains an unused AC_CHECK_LIBM, maybe using that would be a
@@ -168,9 +114,9 @@ CONFIGURE_FLAGS = --prefix=$(shell cd $(PACKAGE_DIR) && \
pwd $(PWDFLAGS))/$(TARFILE_ROOTDIR)/ooo-install \
--disable-dependency-tracking --disable-static --disable-doxygen \
--disable-html-docs --disable-latex-docs CC='$(CC)' CXX='$(CXX)' \
- CXXFLAGS='$(EXTRA_CFLAGS) $(OOO_STLPORT_CXXFLAGS)' \
- LDFLAGS='$(LDFLAGS) $(OOO_STLPORT_LDFLAGS)' \
- LIBS='$(OOO_STLPORT_LIBS) $(MY_LIBS)'
+ CXXFLAGS='$(EXTRA_CFLAGS)' \
+ LDFLAGS='$(LDFLAGS)' \
+ LIBS='$(MY_LIBS)'
BUILD_ACTION = $(GNUMAKE)
BUILD_FLAGS = install
commit da0876a80c4f1c2ae477f75f5aee3eded2e37f2a
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Wed Feb 9 04:26:57 2011 +0100
Make stlport only optional dependency of postprocess
diff --git a/cppunit/prj/build.lst b/cppunit/prj/build.lst
index 9bfcb57..21e2b43 100644
--- a/cppunit/prj/build.lst
+++ b/cppunit/prj/build.lst
@@ -1,2 +1,2 @@
-c5t cppunit : stlport NULL
+c5t cppunit : NULL
c5t cppunit nmake - all cppunit NULL
diff --git a/icc/prj/build.lst b/icc/prj/build.lst
index 9eace5d..e9bf65b 100644
--- a/icc/prj/build.lst
+++ b/icc/prj/build.lst
@@ -1,3 +1,3 @@
-ip icc : solenv stlport external sal NULL
+ip icc : solenv external sal NULL
ip icc usr1 - all ip_mkout NULL
ip icc nmake - all ip_icc NULL
diff --git a/libtextcat/prj/build.lst b/libtextcat/prj/build.lst
index da155db..8516375 100644
--- a/libtextcat/prj/build.lst
+++ b/libtextcat/prj/build.lst
@@ -1,3 +1,3 @@
-ltc libtextcat : stlport soltools solenv NULL
+ltc libtextcat : soltools solenv NULL
ltc libtextcat usr1 - all ltc_mkout NULL
ltc libtextcat nmake - all ltc_libtextcat NULL
diff --git a/libwpd/prj/build.lst b/libwpd/prj/build.lst
index 7e5ae5c..1da425b 100644
--- a/libwpd/prj/build.lst
+++ b/libwpd/prj/build.lst
@@ -1,3 +1,3 @@
-lw libwpd : soltools stlport NULL
+lw libwpd : soltools NULL
lw libwpd usr1 - all lw_mkout NULL
lw libwpd nmake - all lw_libwpd NULL
diff --git a/libxmlsec/prj/build.lst b/libxmlsec/prj/build.lst
index 75939b3..a52eb09 100644
--- a/libxmlsec/prj/build.lst
+++ b/libxmlsec/prj/build.lst
@@ -1,3 +1,3 @@
-ls libxmlsec : stlport soltools LIBXML2:libxml2 MOZ:moz NULL
+ls libxmlsec : soltools LIBXML2:libxml2 MOZ:moz NULL
ls libxmlsec usr1 - all ls_mkout NULL
ls libxmlsec nmake - all ls_xmlsec1 NULL
diff --git a/np_sdk/prj/build.lst b/np_sdk/prj/build.lst
index 7aa9a6d..9617879 100644
--- a/np_sdk/prj/build.lst
+++ b/np_sdk/prj/build.lst
@@ -1,3 +1,3 @@
-np np_sdk : soltools stlport NULL
+np np_sdk : soltools NULL
np np_sdk usr1 - all np_sdk NULL
np np_sdk\mozsrc nmake - all np_mozsrc NULL
diff --git a/redland/prj/build.lst b/redland/prj/build.lst
index f6d0562..c23ad52 100644
--- a/redland/prj/build.lst
+++ b/redland/prj/build.lst
@@ -1,4 +1,4 @@
-rld redland : stlport soltools LIBXML2:libxml2 LIBXSLT:libxslt OPENSSL:openssl NULL
+rld redland : soltools LIBXML2:libxml2 LIBXSLT:libxslt OPENSSL:openssl NULL
rld redland usr1 - all rld_mkout NULL
rld redland\raptor nmake - all rld_raptor NULL
rld redland\rasqal nmake - all rld_rasqal rld_raptor NULL
More information about the Libreoffice-commits
mailing list