diff options
| author | Florian Franzmann | 2018-01-19 23:14:48 +0100 |
|---|---|---|
| committer | Florian Franzmann | 2018-01-19 23:22:52 +0100 |
| commit | e5ef9189b854b2e6426bd0f17f5fea0071b91e19 (patch) | |
| tree | 7e12fe1edaa5769d91097f08b0ced6d2a4056f0e /science-libs | |
| parent | 9e0ad55dc3be681b2c3c9fc06a650412ae3ac0fd (diff) | |
science-libs/lp_solve: version 5.5.2.5
Diffstat (limited to 'science-libs')
| -rwxr-xr-x | science-libs/lp_solve/BUILD | 6 | ||||
| -rwxr-xr-x | science-libs/lp_solve/DETAILS | 4 | ||||
| -rw-r--r-- | science-libs/lp_solve/HISTORY | 4 | ||||
| -rwxr-xr-x | science-libs/lp_solve/PRE_BUILD | 6 | ||||
| -rw-r--r-- | science-libs/lp_solve/isnan.patch | 13 |
5 files changed, 28 insertions, 5 deletions
diff --git a/science-libs/lp_solve/BUILD b/science-libs/lp_solve/BUILD index 9e62f4c210..4dc4afa09b 100755 --- a/science-libs/lp_solve/BUILD +++ b/science-libs/lp_solve/BUILD @@ -3,5 +3,7 @@ sh ccc && cd ../lp_solve && # compile this by hand to take advantage of the previously built liblpsolve # so we don't compile everything three times :) -gcc -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I../shared -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $CFLAGS -c lp_solve.c && -gcc -o lp_solve lp_solve.o $LDFLAGS -lm -ldl -L../lpsolve55 -llpsolve55 +gcc -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd \ + -I../shared -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL \ + -DRoleIsExternalInvEngine $CFLAGS -c lp_solve.c && +gcc -o lp_solve lp_solve.o $LDFLAGS -lm -ldl -L../lpsolve55/bin/ux64 -llpsolve55 diff --git a/science-libs/lp_solve/DETAILS b/science-libs/lp_solve/DETAILS index 2366fa97dc..5f23dcc033 100755 --- a/science-libs/lp_solve/DETAILS +++ b/science-libs/lp_solve/DETAILS @@ -1,10 +1,10 @@ SPELL=lp_solve - VERSION=5.5.2.0 + VERSION=5.5.2.5 SOURCE=${SPELL}_${VERSION}_source.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}_${VERSION:0:3} SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/lpsolve/$SOURCE WEB_SITE=http://lp_solve.sourceforge.net/${VERSION:0:3} - SOURCE_GPG=gurus.gpg:$SOURCE.sig + SOURCE_HASH=sha512:6ae78b01bf50990b8141dfe3c1994bb9e7632db6a200c7900ac44de592b3ac1e21063f7b4554d4960af01538d89e937fc25da14f67156d12464e8cfdf0f86c46 LICENSE[0]=LGPL ENTERED=20060201 KEYWORDS="science libs" diff --git a/science-libs/lp_solve/HISTORY b/science-libs/lp_solve/HISTORY index ba49ad1caa..c0261be774 100644 --- a/science-libs/lp_solve/HISTORY +++ b/science-libs/lp_solve/HISTORY @@ -1,3 +1,7 @@ +2018-01-19 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * DETAILS, BUILD: version 5.5.2.5 + * isnan.patch, PRE_BUILD: add patch from nixOS to fix build error + 2015-05-25 Thomas Orgis <sobukus@sourcemage.org> * DETAILS: remove SOURCEFORGE_URL usage (automated) diff --git a/science-libs/lp_solve/PRE_BUILD b/science-libs/lp_solve/PRE_BUILD index 6cdbfa392d..d08871a0d2 100755 --- a/science-libs/lp_solve/PRE_BUILD +++ b/science-libs/lp_solve/PRE_BUILD @@ -1,5 +1,9 @@ default_pre_build && cd $SOURCE_DIRECTORY && + sedit "s:^opts=.*:opts='$CFLAGS':" lpsolve55/ccc && sedit "s:^opts=.*:opts='$CFLAGS':" lp_solve/ccc && -sedit "s:dl=-ldl:dl='$LDFLAGS -ldl':" lp_solve/ccc +sedit "s:dl=-ldl:dl='$LDFLAGS -ldl':" lp_solve/ccc && + +patch -p1 < "$SPELL_DIRECTORY/isnan.patch" + diff --git a/science-libs/lp_solve/isnan.patch b/science-libs/lp_solve/isnan.patch new file mode 100644 index 0000000000..bc1983d442 --- /dev/null +++ b/science-libs/lp_solve/isnan.patch @@ -0,0 +1,13 @@ +diff -u a/lp_lib.h b/lp_lib.h +--- a/lp_lib.h 2016-05-04 19:45:15.753143720 +0900 ++++ b/lp_lib.h 2016-05-04 19:53:59.536920722 +0900 +@@ -59,9 +59,6 @@ + # if defined _WIN32 && !defined __GNUC__ + # define isnan _isnan + # endif +-#if defined NOISNAN +-# define isnan(x) FALSE +-#endif + + #define SETMASK(variable, mask) variable |= mask + #define CLEARMASK(variable, mask) variable &= ~(mask) |