[Libreoffice-commits] .: lpsolve/lp_solve_5.5-openbsd.patch lpsolve/makefile.mk

[Robert Nagy]

 lpsolve/lp_solve_5.5-openbsd.patch |   20 ++++++++++++++++++++
 lpsolve/makefile.mk                |    4 ++++
 2 files changed, 24 insertions(+)

New commits:
commit 81df2f0f941d0f4b01acbc1ff2d8dafe436ac299
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=