From 511b2f3536965b6f6dd4d6992f65e2048ebd7b62 Mon Sep 17 00:00:00 2001 From: Robert Nagy Date: Thu, 4 Nov 2010 09:27:13 +0100 Subject: [PATCH 1/5] add the correct cppunit library name for OpenBSD --- cppunit/makefile.mk | 4 +++- cppunit/prj/d.lst | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk index 50d489322d31..26e68450277a 100644 --- a/cppunit/makefile.mk +++ b/cppunit/makefile.mk @@ -142,7 +142,7 @@ OOO_STLPORT_LIBS += -lstdc++ # 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" +.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 @@ -183,6 +183,8 @@ OUT2LIB = ooo-install/lib/libcppunit-1.12.1.dylib EXTRPATH = NONE .ELIF "$(OS)" == "AIX" OUT2LIB = ooo-install/lib/libcppunit-1.12.a +.ELIF "$(OS)" == "OPENBSD" +OUT2LIB = ooo-install/lib/libcppunit-1.12.so.1.0 .ELSE OUT2LIB = ooo-install/lib/libcppunit-1.12.so.1 .END diff --git a/cppunit/prj/d.lst b/cppunit/prj/d.lst index e881e4a2d033..3e30ad21bbf0 100644 --- a/cppunit/prj/d.lst +++ b/cppunit/prj/d.lst @@ -24,6 +24,9 @@ symlink: %_DEST%\lib%_EXT%\libcppunit-1.12.1.dylib %_DEST%\lib%_EXT%\libcppunit. ..\%__SRC%\lib\libcppunit-1.12.so.1 %_DEST%\lib%_EXT%\libcppunit-1.12.so.1 symlink: %_DEST%\lib%_EXT%\libcppunit-1.12.so.1 %_DEST%\lib%_EXT%\libcppunit.so +..\%__SRC%\lib\libcppunit-1.12.so.1.0 %_DEST%\lib%_EXT%\libcppunit-1.12.so.1.0 +symlink: %_DEST%\lib%_EXT%\libcppunit-1.12.so.1.0 %_DEST%\lib%_EXT%\libcppunit.so + ..\%__SRC%\lib\libcppunit-1.12.a %_DEST%\lib%_EXT%\libcppunit-1.12.a symlink: %_DEST%\lib%_EXT%\libcppunit-1.12.a %_DEST%\lib%_EXT%\libcppunit.a From 868c488750c22ddbf2ce6f4799874b07b1fcf2e7 Mon Sep 17 00:00:00 2001 From: Robert Nagy Date: Fri, 5 Nov 2010 12:30:11 +0100 Subject: [PATCH 2/5] use '#!/usr/bin/env bash' for the tests --- hyphen/hyphen-2.4.patch | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/hyphen/hyphen-2.4.patch b/hyphen/hyphen-2.4.patch index 33947f550a88..50c859bfec57 100644 --- a/hyphen/hyphen-2.4.patch +++ b/hyphen/hyphen-2.4.patch @@ -166,4 +166,11 @@ diff -u misc/hyphen-2.4/makefile.mk misc/build/hyphen-2.4/makefile.mk +ALL: ALLTAR + +.INCLUDE : target.mk -Common subdirectories: misc/hyphen-2.4/tests and misc/build/hyphen-2.4/tests +--- misc/hyphen-2.4/tests/test.sh Wed Apr 30 14:12:33 2008 ++++ misc/build/hyphen-2.4/tests/test.sh Fri Nov 5 09:05:16 2010 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/bin/env bash + + function check_valgrind_log () { + if [ "$VALGRIND" != "" ]; then From bbe92d767cb980cf2b06a2ca40972213fbbd5c8e Mon Sep 17 00:00:00 2001 From: Robert Nagy Date: Fri, 5 Nov 2010 15:04:24 +0100 Subject: [PATCH 3/5] Do not set -ldl on OpenBSD --- lpsolve/lp_solve_5.5-openbsd.patch | 20 ++++++++++++++++++++ lpsolve/makefile.mk | 4 ++++ 2 files changed, 24 insertions(+) create mode 100644 lpsolve/lp_solve_5.5-openbsd.patch diff --git a/lpsolve/lp_solve_5.5-openbsd.patch b/lpsolve/lp_solve_5.5-openbsd.patch new file mode 100644 index 000000000000..d632d918a1de --- /dev/null +++ b/lpsolve/lp_solve_5.5-openbsd.patch @@ -0,0 +1,20 @@ +--- misc/lp_solve_5.5/lpsolve55/ccc Fri Nov 5 13:51:18 2010 ++++ misc/build/lp_solve_5.5/lpsolve55/ccc Fri Nov 5 13:51:11 2010 +@@ -6,7 +6,7 @@ + if [ "$PLATFORM" = "SCO_UNIX" ] + then def='-dy -K PIC -DNOLONGLONG' + dl=-lc +-else dl=-ldl ++else + so=y + fi + +@@ -19,7 +19,7 @@ + if [ "$so" != "" ] + then + $c -fpic -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src +- $c -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -ldl ++ $c -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm + fi + + rm *.o 2>/dev/null diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk index 5261bc9b835d..70460646803d 100644 --- a/lpsolve/makefile.mk +++ b/lpsolve/makefile.mk @@ -48,6 +48,10 @@ PATCH_FILES=\ ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.os2 .ENDIF +.IF "$(OS)"=="OPENBSD" +PATCH_FILES+=lp_solve_5.5-openbsd.patch +.ENDIF + CONFIGURE_DIR= CONFIGURE_ACTION= CONFIGURE_FLAGS= From afa30b0f1f7f9c715b8d8775d9b0511f8e8b9247 Mon Sep 17 00:00:00 2001 From: Robert Nagy Date: Sat, 6 Nov 2010 18:31:12 +0100 Subject: [PATCH 4/5] add OPENBSD ifdefs where needed --- external/gcc3_specific/makefile.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/external/gcc3_specific/makefile.mk b/external/gcc3_specific/makefile.mk index d285fb34166a..dd84b5327234 100644 --- a/external/gcc3_specific/makefile.mk +++ b/external/gcc3_specific/makefile.mk @@ -45,6 +45,7 @@ $(MINGWGXXDLL) : .IF "$(OS)"!="MACOSX" .IF "$(OS)"!="FREEBSD" .IF "$(OS)"!="NETBSD" +.IF "$(OS)"!="OPENBSD" .EXPORT : CC @@ -71,6 +72,7 @@ $(LB)$/libgcc_s.so.$(SHORTSTDC3) : .ENDIF +.ENDIF .ENDIF .ENDIF .ENDIF From a456ac835866d57f83c4cca2d44c0183c03047bd Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Thu, 11 Nov 2010 13:25:04 +0100 Subject: [PATCH 5/5] Version 3.2.99.3, tag LIBREOFFICE_3_2_99_3 (3.3-beta3)