Thu Jul 13 13:02:43 2017 UTC ()
Honor LDFLAGS. Fixes RELRO build.


(wiz)
diff -r1.5 -r1.6 pkgsrc/math/lp_solve/distinfo
diff -r1.1 -r1.2 pkgsrc/math/lp_solve/patches/patch-demo_ccc
diff -r1.2 -r1.3 pkgsrc/math/lp_solve/patches/patch-lp__solve_ccc
diff -r1.2 -r1.3 pkgsrc/math/lp_solve/patches/patch-lpsolve55_ccc
cvs diff -r1.5 -r1.6 pkgsrc/math/lp_solve/distinfo (expand / switch to unified diff)

--- pkgsrc/math/lp_solve/distinfo 2016/09/08 05:12:39 1.5
+++ pkgsrc/math/lp_solve/distinfo 2017/07/13 13:02:43 1.6
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.5 2016/09/08 05:12:39 richard Exp $ 1$NetBSD: distinfo,v 1.6 2017/07/13 13:02:43 wiz Exp $
2 2
3SHA1 (lp_solve_5.5.2.3_source.tar.gz) = 867a606fcc77612b71a0a6baa5f07a273f3023a7 3SHA1 (lp_solve_5.5.2.3_source.tar.gz) = 867a606fcc77612b71a0a6baa5f07a273f3023a7
4RMD160 (lp_solve_5.5.2.3_source.tar.gz) = 5657c47cf996979072fb2a1135d071e48da52ea1 4RMD160 (lp_solve_5.5.2.3_source.tar.gz) = 5657c47cf996979072fb2a1135d071e48da52ea1
5SHA512 (lp_solve_5.5.2.3_source.tar.gz) = ed4c9e993e6836fdc8bae76d4ff2f48594d6f9ababbedaf83253d0e31815faa8608b110866b03a0336a7334c531efb9987ec231f8e7a62eff7efea683a1868cf 5SHA512 (lp_solve_5.5.2.3_source.tar.gz) = ed4c9e993e6836fdc8bae76d4ff2f48594d6f9ababbedaf83253d0e31815faa8608b110866b03a0336a7334c531efb9987ec231f8e7a62eff7efea683a1868cf
6Size (lp_solve_5.5.2.3_source.tar.gz) = 812420 bytes 6Size (lp_solve_5.5.2.3_source.tar.gz) = 812420 bytes
7SHA1 (patch-aa) = a77ec29e056252b3b82c1a1acdd463b5ff7f6f6b 7SHA1 (patch-aa) = a77ec29e056252b3b82c1a1acdd463b5ff7f6f6b
8SHA1 (patch-demo_ccc) = 6262975fdcc61e94390060425a79e8bbc5f4554b 8SHA1 (patch-demo_ccc) = dd5d00bce28fa89db343489bf22f0c96d3a9894b
9SHA1 (patch-lp__solve_ccc) = 122d6ba0cb00acc6abbf4826f71e29ae1beb808d 9SHA1 (patch-lp__solve_ccc) = a83a73f420bae7a9529bac8cf5f283651d27c80d
10SHA1 (patch-lp__utils.c) = b0774bd7b323f12c97c7bc78c26f64a75c841f34 10SHA1 (patch-lp__utils.c) = b0774bd7b323f12c97c7bc78c26f64a75c841f34
11SHA1 (patch-lpsolve55_ccc) = 0ac4adf032b89a76ccc3f834c750c0f3885a1aa5 11SHA1 (patch-lpsolve55_ccc) = c84ba64ffaa5aa9f04701c771b644f99318bc6da
cvs diff -r1.1 -r1.2 pkgsrc/math/lp_solve/patches/patch-demo_ccc (expand / switch to unified diff)

--- pkgsrc/math/lp_solve/patches/patch-demo_ccc 2015/12/07 17:40:27 1.1
+++ pkgsrc/math/lp_solve/patches/patch-demo_ccc 2017/07/13 13:02:43 1.2
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: patch-demo_ccc,v 1.1 2015/12/07 17:40:27 joerg Exp $ 1$NetBSD: patch-demo_ccc,v 1.2 2017/07/13 13:02:43 wiz Exp $
2 2
3--- demo/ccc.orig 2015-12-07 17:17:03.273655855 +0000 3--- demo/ccc.orig 2015-12-07 17:17:03.273655855 +0000
4+++ demo/ccc 4+++ demo/ccc
5@@ -12,4 +12,4 @@ fi 5@@ -12,4 +12,4 @@ fi
6  6
7 opts='-O3' 7 opts='-O3'
8  8
9-$c -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I../shared $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine demo.c $src -o demo $math $dl 9-$c -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I../shared $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine demo.c $src -o demo $math $dl
10+$c -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I../shared $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine demo.c $src -o demo $math $DL_LDADD 10+$c -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I../shared $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine demo.c $src -o demo $math $DL_LDADD $LDFLAGS
cvs diff -r1.2 -r1.3 pkgsrc/math/lp_solve/patches/patch-lp__solve_ccc (expand / switch to unified diff)

--- pkgsrc/math/lp_solve/patches/patch-lp__solve_ccc 2016/09/08 05:12:39 1.2
+++ pkgsrc/math/lp_solve/patches/patch-lp__solve_ccc 2017/07/13 13:02:43 1.3
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1$NetBSD: patch-lp__solve_ccc,v 1.2 2016/09/08 05:12:39 richard Exp $ 1$NetBSD: patch-lp__solve_ccc,v 1.3 2017/07/13 13:02:43 wiz Exp $
2 2
3recent versions of gcc are noisy unless main() is declared returning 'int' 3recent versions of gcc are noisy unless main() is declared returning 'int'
4and isnan() needs a floating argument else NOISNAN is defined causing 4and isnan() needs a floating argument else NOISNAN is defined causing
5problems. 5problems.
6 6
7--- lp_solve/ccc.orig 2009-01-25 18:39:03.000000000 +0000 7--- lp_solve/ccc.orig 2009-01-25 18:39:03.000000000 +0000
8+++ lp_solve/ccc 8+++ lp_solve/ccc
9@@ -20,7 +20,7 @@ math=-lm 9@@ -20,7 +20,7 @@ math=-lm
10 echo '#include <stdio.h>'>>/tmp/isnan.c 10 echo '#include <stdio.h>'>>/tmp/isnan.c
11 echo '#include <stdlib.h>'>>/tmp/isnan.c 11 echo '#include <stdlib.h>'>>/tmp/isnan.c
12 echo '#include <math.h>'>>/tmp/isnan.c 12 echo '#include <math.h>'>>/tmp/isnan.c
13-echo 'main(){isnan(0);}'>>/tmp/isnan.c 13-echo 'main(){isnan(0);}'>>/tmp/isnan.c
14+echo 'int main(){isnan(0.0);}'>>/tmp/isnan.c 14+echo 'int main(){isnan(0.0);}'>>/tmp/isnan.c
15 $c /tmp/isnan.c -o /tmp/isnan $math >/dev/null 2>&1 15 $c /tmp/isnan.c -o /tmp/isnan $math >/dev/null 2>&1
16 if [ $? = 0 ] 16 if [ $? = 0 ]
17 then NOISNAN= 17 then NOISNAN=
18@@ -38,4 +38,4 @@ then opts='-O0' 18@@ -38,4 +38,4 @@ then opts='-O0'
19 else dl=-ldl 19 else dl=-ldl
20 fi 20 fi
21  21
22-$c -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I../shared $opts $def $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src -o bin/$PLATFORM/lp_solve $math $dl 22-$c -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I../shared $opts $def $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src -o bin/$PLATFORM/lp_solve $math $dl
23+$c -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I../shared $opts $def $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src -o bin/$PLATFORM/lp_solve $math $DL_LDADD 23+$c -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I../shared $opts $def $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src -o bin/$PLATFORM/lp_solve $math $DL_LDADD $LDFLAGS
cvs diff -r1.2 -r1.3 pkgsrc/math/lp_solve/patches/patch-lpsolve55_ccc (expand / switch to unified diff)

--- pkgsrc/math/lp_solve/patches/patch-lpsolve55_ccc 2016/09/08 05:12:39 1.2
+++ pkgsrc/math/lp_solve/patches/patch-lpsolve55_ccc 2017/07/13 13:02:43 1.3
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1$NetBSD: patch-lpsolve55_ccc,v 1.2 2016/09/08 05:12:39 richard Exp $ 1$NetBSD: patch-lpsolve55_ccc,v 1.3 2017/07/13 13:02:43 wiz Exp $
2 2
3recent versions of gcc are noisy unless main() is declared returning 'int' 3recent versions of gcc are noisy unless main() is declared returning 'int'
4and isnan() needs a floating argument else NOISNAN is defined causing 4and isnan() needs a floating argument else NOISNAN is defined causing
5problems. 5problems.
6 6
7--- lpsolve55/ccc.orig 2009-03-25 00:27:18.000000000 +0000 7--- lpsolve55/ccc.orig 2009-03-25 00:27:18.000000000 +0000
8+++ lpsolve55/ccc 8+++ lpsolve55/ccc
9@@ -18,7 +18,7 @@ mkdir bin bin/$PLATFORM >/dev/null 2>&1 9@@ -18,7 +18,7 @@ mkdir bin bin/$PLATFORM >/dev/null 2>&1
10 echo '#include <stdio.h>'>>/tmp/isnan.c 10 echo '#include <stdio.h>'>>/tmp/isnan.c
11 echo '#include <stdlib.h>'>>/tmp/isnan.c 11 echo '#include <stdlib.h>'>>/tmp/isnan.c
12 echo '#include <math.h>'>>/tmp/isnan.c 12 echo '#include <math.h>'>>/tmp/isnan.c
13-echo 'main(){isnan(0);}'>>/tmp/isnan.c 13-echo 'main(){isnan(0);}'>>/tmp/isnan.c
14+echo 'int main(){isnan(0.0);}'>>/tmp/isnan.c 14+echo 'int main(){isnan(0.0);}'>>/tmp/isnan.c
15 $c /tmp/isnan.c -o /tmp/isnan $math >/dev/null 2>&1 15 $c /tmp/isnan.c -o /tmp/isnan $math >/dev/null 2>&1
16 if [ $? = 0 ] 16 if [ $? = 0 ]
17 then NOISNAN= 17 then NOISNAN=
18@@ -44,7 +44,7 @@ ranlib bin/$PLATFORM/liblpsolve55.a 18@@ -44,7 +44,7 @@ ranlib bin/$PLATFORM/liblpsolve55.a
19 if [ "$so" != "" ] 19 if [ "$so" != "" ]
20 then 20 then
21 $c -fpic -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src 21 $c -fpic -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
22- $c -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o bin/$PLATFORM/liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -ldl 22- $c -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o bin/$PLATFORM/liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -ldl
23+ $c -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o bin/$PLATFORM/liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm $DL_LDADD 23+ $c -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o bin/$PLATFORM/liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm $DL_LDADD $LDFLAGS
24 fi 24 fi
25  25
26 rm *.o 2>/dev/null 26 rm *.o 2>/dev/null