CVS commit: pkgsrc/math/lp_solve

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jul 13 13:02:43 UTC 2017

Modified Files:
        pkgsrc/math/lp_solve: distinfo
        pkgsrc/math/lp_solve/patches: patch-demo_ccc patch-lp__solve_ccc
            patch-lpsolve55_ccc

Log Message:
Honor LDFLAGS. Fixes RELRO build.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/math/lp_solve/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/math/lp_solve/patches/patch-demo_ccc
cvs rdiff -u -r1.2 -r1.3 pkgsrc/math/lp_solve/patches/patch-lp__solve_ccc \
    pkgsrc/math/lp_solve/patches/patch-lpsolve55_ccc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/lp_solve/distinfo
diff -u pkgsrc/math/lp_solve/distinfo:1.5 pkgsrc/math/lp_solve/distinfo:1.6
--- pkgsrc/math/lp_solve/distinfo:1.5   Thu Sep  8 05:12:39 2016
+++ pkgsrc/math/lp_solve/distinfo       Thu Jul 13 13:02:43 2017
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.5 2016/09/08 05:12:39 richard Exp $
+$NetBSD: distinfo,v 1.6 2017/07/13 13:02:43 wiz Exp $
 
 SHA1 (lp_solve_5.5.2.3_source.tar.gz) = 867a606fcc77612b71a0a6baa5f07a273f3023a7
 RMD160 (lp_solve_5.5.2.3_source.tar.gz) = 5657c47cf996979072fb2a1135d071e48da52ea1
 SHA512 (lp_solve_5.5.2.3_source.tar.gz) = ed4c9e993e6836fdc8bae76d4ff2f48594d6f9ababbedaf83253d0e31815faa8608b110866b03a0336a7334c531efb9987ec231f8e7a62eff7efea683a1868cf
 Size (lp_solve_5.5.2.3_source.tar.gz) = 812420 bytes
 SHA1 (patch-aa) = a77ec29e056252b3b82c1a1acdd463b5ff7f6f6b
-SHA1 (patch-demo_ccc) = 6262975fdcc61e94390060425a79e8bbc5f4554b
-SHA1 (patch-lp__solve_ccc) = 122d6ba0cb00acc6abbf4826f71e29ae1beb808d
+SHA1 (patch-demo_ccc) = dd5d00bce28fa89db343489bf22f0c96d3a9894b
+SHA1 (patch-lp__solve_ccc) = a83a73f420bae7a9529bac8cf5f283651d27c80d
 SHA1 (patch-lp__utils.c) = b0774bd7b323f12c97c7bc78c26f64a75c841f34
-SHA1 (patch-lpsolve55_ccc) = 0ac4adf032b89a76ccc3f834c750c0f3885a1aa5
+SHA1 (patch-lpsolve55_ccc) = c84ba64ffaa5aa9f04701c771b644f99318bc6da

Index: pkgsrc/math/lp_solve/patches/patch-demo_ccc
diff -u pkgsrc/math/lp_solve/patches/patch-demo_ccc:1.1 pkgsrc/math/lp_solve/patches/patch-demo_ccc:1.2
--- pkgsrc/math/lp_solve/patches/patch-demo_ccc:1.1     Mon Dec  7 17:40:27 2015
+++ pkgsrc/math/lp_solve/patches/patch-demo_ccc Thu Jul 13 13:02:43 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-demo_ccc,v 1.1 2015/12/07 17:40:27 joerg Exp $
+$NetBSD: patch-demo_ccc,v 1.2 2017/07/13 13:02:43 wiz Exp $
 
 --- demo/ccc.orig      2015-12-07 17:17:03.273655855 +0000
 +++ demo/ccc
@@ -7,4 +7,4 @@ $NetBSD: patch-demo_ccc,v 1.1 2015/12/07
  opts='-O3'
  
 -$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
-+$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
++$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

Index: pkgsrc/math/lp_solve/patches/patch-lp__solve_ccc
diff -u pkgsrc/math/lp_solve/patches/patch-lp__solve_ccc:1.2 pkgsrc/math/lp_solve/patches/patch-lp__solve_ccc:1.3
--- pkgsrc/math/lp_solve/patches/patch-lp__solve_ccc:1.2        Thu Sep  8 05:12:39 2016
+++ pkgsrc/math/lp_solve/patches/patch-lp__solve_ccc    Thu Jul 13 13:02:43 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-lp__solve_ccc,v 1.2 2016/09/08 05:12:39 richard Exp $
+$NetBSD: patch-lp__solve_ccc,v 1.3 2017/07/13 13:02:43 wiz Exp $
 
 recent versions of gcc are noisy unless main() is declared returning 'int'
 and isnan() needs a floating argument else NOISNAN is defined causing
@@ -20,4 +20,4 @@ problems.
  fi
  
 -$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
-+$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
++$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
Index: pkgsrc/math/lp_solve/patches/patch-lpsolve55_ccc
diff -u pkgsrc/math/lp_solve/patches/patch-lpsolve55_ccc:1.2 pkgsrc/math/lp_solve/patches/patch-lpsolve55_ccc:1.3
--- pkgsrc/math/lp_solve/patches/patch-lpsolve55_ccc:1.2        Thu Sep  8 05:12:39 2016
+++ pkgsrc/math/lp_solve/patches/patch-lpsolve55_ccc    Thu Jul 13 13:02:43 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-lpsolve55_ccc,v 1.2 2016/09/08 05:12:39 richard Exp $
+$NetBSD: patch-lpsolve55_ccc,v 1.3 2017/07/13 13:02:43 wiz Exp $
 
 recent versions of gcc are noisy unless main() is declared returning 'int'
 and isnan() needs a floating argument else NOISNAN is defined causing
@@ -20,7 +20,7 @@ problems.
  then
    $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
 -  $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
-+  $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
++  $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
  fi
  
  rm *.o 2>/dev/null