[Libreoffice-commits] .: 6 commits -

Fri Nov 12 06:53:56 PST 2010

0 files changed

New commits:
commit a56636c186ba86c491c491e934712c13a6e7839b
Merge: 71a863a... 52bf255...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Nov 12 14:35:17 2010 +0100

    Merge remote branch 'origin/libreoffice-3-3'

commit 52bf255371c1734276ff56729e29c07c9df340c8
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Nov 11 13:25:04 2010 +0100

    Version 3.2.99.3, tag LIBREOFFICE_3_2_99_3 (3.3-beta3)
commit b770c0fc3a54bc1766bdea05347b084dd757f055
Author: Robert Nagy <robert at openbsd.org>
Date:   Sat Nov 6 18:31:12 2010 +0100

    add OPENBSD ifdefs where needed

diff --git a/external/gcc3_specific/makefile.mk b/external/gcc3_specific/makefile.mk
index d285fb3..dd84b53 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
 
@@ -73,6 +74,7 @@ $(LB)$/libgcc_s.so.$(SHORTSTDC3) :
 
 .ENDIF
 .ENDIF
+.ENDIF
 .ENDIF 
 
 .ENDIF
commit a448578a096a06a6f6efeacff7fbdf3cd3f1825a
Author: Robert Nagy <robert at openbsd.org>
Date:   Fri Nov 5 15:04:24 2010 +0100

    Do not set -ldl on OpenBSD

diff --git a/lpsolve/lp_solve_5.5-openbsd.patch b/lpsolve/lp_solve_5.5-openbsd.patch
new file mode 100644
index 0000000..d632d91
--- /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 5261bc9..7046064 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=
commit 52638e5bd425c02d5b7f3b0bb8039a54c14daadf
Author: Robert Nagy <robert at openbsd.org>
Date:   Fri Nov 5 12:30:11 2010 +0100

    use '#!/usr/bin/env bash' for the tests

diff --git a/hyphen/hyphen-2.4.patch b/hyphen/hyphen-2.4.patch
index 33947f5..50c859b 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
commit ec6cef077699a1f2d4f37c81ac44e36fb924aeb8
Author: Robert Nagy <robert at openbsd.org>
Date:   Thu Nov 4 09:27:13 2010 +0100

    add the correct cppunit library name for OpenBSD

diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index 50d4893..26e6845 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 e881e4a..3e30ad2 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
 
