summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Nagy <robert@openbsd.org>2011-05-22 11:24:38 +0200
committerRobert Nagy <robert@openbsd.org>2011-05-22 11:24:38 +0200
commit6042d4a2af45cb9446e879bea0deca6939bf1410 (patch)
treec8e5c984e74058d320fd676d39cc4e074a1251db
parent60eb0c9aa0442a69e27fcdd49774d98f33a0db7d (diff)
-ldl is linux only and remove -lc from the flags toofeature/calc-multiline-input
-rw-r--r--lpsolve/lp_solve_5.5-openbsd.patch20
-rw-r--r--lpsolve/lp_solve_5.5.patch49
-rw-r--r--lpsolve/makefile.mk4
3 files changed, 31 insertions, 42 deletions
diff --git a/lpsolve/lp_solve_5.5-openbsd.patch b/lpsolve/lp_solve_5.5-openbsd.patch
deleted file mode 100644
index d632d91..0000000
--- a/lpsolve/lp_solve_5.5-openbsd.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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/lp_solve_5.5.patch b/lpsolve/lp_solve_5.5.patch
index 661a8d3..5edcd0d 100644
--- a/lpsolve/lp_solve_5.5.patch
+++ b/lpsolve/lp_solve_5.5.patch
@@ -1,40 +1,53 @@
---- misc/lp_solve_5.5/lpsolve55/ccc Sat Jun 11 21:27:18 2005
-+++ misc/build/lp_solve_5.5/lpsolve55/ccc Wed May 21 17:19:56 2008
-@@ -1,11 +1,20 @@
+--- misc/build/lp_solve_5.5/lpsolve55/ccc.orig Sat Jun 11 21:27:18 2005
++++ misc/build/lp_solve_5.5/lpsolve55/ccc Sun May 22 11:20:19 2011
+@@ -1,15 +1,28 @@
src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
-c=cc
+c=$CC
def=
so=
-+soprefix=
-+libs=
-+pic=
-+ldflags=
-+inline=
-if [ "$PLATFORM" = "SCO_UNIX" ]
-then def='-dy -K PIC -DNOLONGLONG'
- dl=-lc
-else dl=-ldl
- so=y
++soprefix=
++libs=
++pic=
++ldflags=
++inline=
+if [ "$GUI" = "WNT" -a "$COM" = "GCC" ]; then
+ so=dll
+ inline=-DINLINE=static
+else
+ so=so
+ soprefix=lib
-+ libs="-lc -lm -ldl"
++ libs="-lm"
+ pic=-fpic
+ ldflags="-Wl,-Bsymbolic -Wl,-soname,liblpsolve55.$so"
fi
-@@ -19,3 +19,3 @@
+
++if [ "$OS" = "LINUX" ]; then
++ libs="$libs -ldl"
++fi
++
+ opts='-O3'
+
+ $c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
+@@ -18,8 +31,8 @@
+
+ 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 $pic -s $inline -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 $ldflags -o ${soprefix}lpsolve55.$so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` $libs
fi
---- misc/lp_solve_5.5/lpsolve55/ccc.osx Thu Jun 23 22:53:08 2005
-+++ misc/build/lp_solve_5.5/lpsolve55/ccc.osx Wed May 21 17:19:56 2008
+
+ rm *.o 2>/dev/null
+--- misc/build/lp_solve_5.5/lpsolve55/ccc.osx.orig Thu Jun 23 22:53:08 2005
++++ misc/build/lp_solve_5.5/lpsolve55/ccc.osx Sun May 22 11:19:48 2011
@@ -1,8 +1,12 @@
src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
-c=cc
@@ -66,9 +79,9 @@
fi
rm *.o 2>/dev/null
---- misc/lp_solve_5.5/lpsolve55/ccc.solaris Wed May 21 17:45:07 2008
-+++ misc/build/lp_solve_5.5/lpsolve55/ccc.solaris Wed May 21 17:44:54 2008
-@@ -1,1 +1,31 @@
+--- misc/build/lp_solve_5.5/lpsolve55/ccc.solaris.orig Sun May 22 11:19:48 2011
++++ misc/build/lp_solve_5.5/lpsolve55/ccc.solaris Sun May 22 11:19:48 2011
+@@ -1 +1,31 @@
-dummy
+src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
+c=$CC
@@ -101,9 +114,9 @@
+fi
+
+rm *.o 2>/dev/null
---- misc/build/lp_solve_5.5/lpsolve55/ccc.ios
-+++ misc/build/lp_solve_5.5/lpsolve55/ccc.ios
-@@ -1,1 +1,11 @@
+--- misc/build/lp_solve_5.5/lpsolve55/ccc.ios.orig Sun May 22 11:19:48 2011
++++ misc/build/lp_solve_5.5/lpsolve55/ccc.ios Sun May 22 11:19:48 2011
+@@ -1 +1,11 @@
-dummy
+src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
+obj=`echo $src|sed -e 's/\.c/.o/g' -e 's!\([^ ]*/\)*!!g'`
diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk
index 21dca49..7e47591 100644
--- a/lpsolve/makefile.mk
+++ b/lpsolve/makefile.mk
@@ -48,10 +48,6 @@ PATCH_FILES=\
ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.ios
.ENDIF
-.IF "$(OS)"=="OPENBSD"
-PATCH_FILES+=lp_solve_5.5-openbsd.patch
-.ENDIF
-
CONFIGURE_DIR=
CONFIGURE_ACTION=
CONFIGURE_FLAGS=