diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2008-02-20 04:30:20 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2008-02-20 04:30:20 +0000 |
| commit | 6507138132a0ccc3d6b1fc1244fc4e914a599e03 (patch) | |
| tree | a8c4ddfc3bd9e066c18fec1053a6e7ad8d836051 /editors/openoffice.org-vcltesttool/files | |
| parent | Update to 5.04, updated for the 2007 tax-year! (diff) | |
Build fix on amd64.
Submitted by: pav via pointyhat
Notes
Notes:
svn path=/head/; revision=207623
Diffstat (limited to 'editors/openoffice.org-vcltesttool/files')
| -rw-r--r-- | editors/openoffice.org-vcltesttool/files/patch-i85972 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i85972 b/editors/openoffice.org-vcltesttool/files/patch-i85972 index 6b47bcd9a479..4b24c9d2ca7d 100644 --- a/editors/openoffice.org-vcltesttool/files/patch-i85972 +++ b/editors/openoffice.org-vcltesttool/files/patch-i85972 @@ -20,7 +20,7 @@ diff -u -r1.2 lp_solve_5.5.patch +! def= +! so=yes +! -+! opts='-O3' ++! opts='-O3 -DINTEGERTIME' +! +! $CC -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 +! ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` @@ -28,8 +28,8 @@ diff -u -r1.2 lp_solve_5.5.patch +! +! if [ "$so" != "" ] +! then -+! $CC -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 -+! $CC -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -lcompat ++! $CC -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 ++! $CC -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 @@ -54,7 +54,7 @@ diff -u -r1.3 makefile.mk BUILD_ACTION=sh ccc.solaris .ELSE +.IF "$(OS)"=="FREEBSD" -+BUILD_ACTION=sh ccc.freebsd ++BUILD_ACTION=sh -x ccc.freebsd +OUT2LIB=$(BUILD_DIR)$/liblpsolve55.so +.ELSE BUILD_ACTION=sh ccc |