diff options
| author | Caolán McNamara <cmc@openoffice.org> | 2010-05-31 22:58:51 +0100 |
|---|---|---|
| committer | Caolán McNamara <cmc@openoffice.org> | 2010-05-31 22:58:51 +0100 |
| commit | 4f858037dd32df64926cb23549b8c5b3808ea263 (patch) | |
| tree | 0607a3b39400361945454a4c47571e42ab87533a /cppunit | |
| parent | e1c7b9d3a93f3083fffd9c2cb76fd11addbd2efe (diff) | |
| parent | 8c29919ec8428c9cbb2a1c8a7dad4dfcd232af5c (diff) | |
cmcfixes74: merge with DEV300 m80
Diffstat (limited to 'cppunit')
| -rw-r--r-- | cppunit/ldflags.patch | 10 | ||||
| -rw-r--r-- | cppunit/makefile.mk | 4 |
2 files changed, 12 insertions, 2 deletions
diff --git a/cppunit/ldflags.patch b/cppunit/ldflags.patch new file mode 100644 index 000000000000..cecd69a4b5ee --- /dev/null +++ b/cppunit/ldflags.patch @@ -0,0 +1,10 @@ +--- misc/cppunit-1.12.1/src/cppunit/Makefile.am Wed Feb 20 06:36:38 2008 ++++ misc/build/cppunit-1.12.1/src/cppunit/Makefile.am Mon May 3 17:00:41 2010 +@@ -63,5 +63,6 @@ + + libcppunit_la_LDFLAGS= \ + -no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ +- -release $(LT_RELEASE) ++ -release $(LT_RELEASE) \ ++ @LIBADD_DL@ + diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk index b57c341e2a23..4b1a7deac533 100644 --- a/cppunit/makefile.mk +++ b/cppunit/makefile.mk @@ -34,7 +34,7 @@ TARFILE_MD5=bd30e9cf5523cdfc019b94f5e1d7fd19 # from <https://sourceforge.net/projects/cppunit/files/cppunit/1.12.1/ # cppunit-1.12.1.tar.gz/download> -PATCH_FILES = solarisfinite.patch warnings.patch windows.patch +PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch # solarisfinite.patch: see <https://sourceforge.net/tracker/?func=detail& # aid=2912590&group_id=11795&atid=311795> # warnings.patch: see <https://sourceforge.net/tracker/?func=detail& @@ -97,7 +97,7 @@ OOO_STLPORT_LIBS += -lm # 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)" == "LINUX" || "$(OS)" == "SOLARIS" +.IF "$(OS)" == "FREEBSD" || "$(OS)" == "LINUX" || "$(OS)" == "SOLARIS" .IF "$(LD_LIBRARY_PATH)" == "" LD_LIBRARY_PATH := $(SOLARLIBDIR) # strictly speaking, this is incorrect if the LD_LIBRARY_PATH environment |