diff options
| author | Robert Nagy <robert@openbsd.org> | 2010-11-05 15:04:24 +0100 |
|---|---|---|
| committer | Robert Nagy <robert@openbsd.org> | 2010-11-05 15:04:24 +0100 |
| commit | 60c398724ad1147ba67380d1ec279735d8464fc0 (patch) | |
| tree | 9c8c68a3eb38355970b14cfdb1d66c26c5ea40f5 /lpsolve | |
| parent | ac94b3f8592c3400aea29dbcaae5d4664ac77553 (diff) | |
Do not set -ldl on OpenBSD
Diffstat (limited to 'lpsolve')
| -rw-r--r-- | lpsolve/lp_solve_5.5-openbsd.patch | 20 | ||||
| -rw-r--r-- | lpsolve/makefile.mk | 4 |
2 files changed, 24 insertions, 0 deletions
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= |