Browse Source

[lpsolve] fix compilation issue in relation to isnan [with Sascha Wunderlich, David Müller]

The compilation wrapper 'ccc' of lpsolve tries to determine
whether the isnan macro is defined. The test program calls
isnan(0), i.e., with an integer argument. On current Arch Linux,
GCC uses _builtin_isnan, which leads to an error due to the integer
argument and the 'ccc' wrapper assumes that isnan is not defined.
This leads to compilation issues later on.

The fix replaces the isnan(0) test call with isnan(0.0).


git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11216 bbc10eb1-c90d-0410-af57-cb519fbb1720
master
Joachim Klein 10 years ago
parent
commit
7cb9ce5788
  1. 2
      prism/ext/lpsolve55/src/lp_solve_5.5/lp_solve/ccc
  2. 2
      prism/ext/lpsolve55/src/lp_solve_5.5/lp_solve/ccc.osx
  3. 2
      prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc
  4. 2
      prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc.aix
  5. 2
      prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc.cygwin
  6. 2
      prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc.hp-ux
  7. 2
      prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc.osx
  8. 2
      prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc.osx64
  9. 2
      prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc.solaris
  10. 2
      prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/cccLUSOL.osx

2
prism/ext/lpsolve55/src/lp_solve_5.5/lp_solve/ccc

@ -20,7 +20,7 @@ math=-lm
echo '#include <stdio.h>'>>/tmp/isnan.c
echo '#include <stdlib.h>'>>/tmp/isnan.c
echo '#include <math.h>'>>/tmp/isnan.c
echo 'main(){isnan(0);}'>>/tmp/isnan.c
echo 'main(){isnan(0.0);}'>>/tmp/isnan.c
$c /tmp/isnan.c -o /tmp/isnan $math >/dev/null 2>&1
if [ $? = 0 ]
then NOISNAN=

2
prism/ext/lpsolve55/src/lp_solve_5.5/lp_solve/ccc.osx

@ -20,7 +20,7 @@ math=-lm
echo '#include <stdio.h>'>>/tmp/isnan.c
echo '#include <stdlib.h>'>>/tmp/isnan.c
echo '#include <math.h>'>>/tmp/isnan.c
echo 'main(){isnan(0);}'>>/tmp/isnan.c
echo 'main(){isnan(0.0);}'>>/tmp/isnan.c
$c /tmp/isnan.c -o /tmp/isnan $math >/dev/null 2>&1
if [ $? = 0 ]
then NOISNAN=

2
prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc

@ -28,7 +28,7 @@ mkdir bin bin/$PLATFORM >/dev/null 2>&1
echo '#include <stdio.h>'>>/tmp/isnan.c
echo '#include <stdlib.h>'>>/tmp/isnan.c
echo '#include <math.h>'>>/tmp/isnan.c
echo 'main(){isnan(0);}'>>/tmp/isnan.c
echo 'main(){isnan(0.0);}'>>/tmp/isnan.c
$c $CFLAGS /tmp/isnan.c -o /tmp/isnan $math >/dev/null 2>&1
if [ $? = 0 ]
then NOISNAN=

2
prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc.aix

@ -23,7 +23,7 @@ mkdir bin bin/$PLATFORM >/dev/null 2>&1
echo '#include <stdio.h>'>>/tmp/isnan.c
echo '#include <stdlib.h>'>>/tmp/isnan.c
echo '#include <math.h>'>>/tmp/isnan.c
echo 'main(){isnan(0);}'>>/tmp/isnan.c
echo 'main(){isnan(0.0);}'>>/tmp/isnan.c
$c /tmp/isnan.c -o /tmp/isnan $math >/dev/null 2>&1
if [ $? = 0 ]
then NOISNAN=

2
prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc.cygwin

@ -18,7 +18,7 @@ mkdir bin bin/$PLATFORM >/dev/null 2>&1
echo '#include <stdio.h>'>>/tmp/isnan.c
echo '#include <stdlib.h>'>>/tmp/isnan.c
echo '#include <math.h>'>>/tmp/isnan.c
echo 'main(){isnan(0);}'>>/tmp/isnan.c
echo 'main(){isnan(0.0);}'>>/tmp/isnan.c
$c /tmp/isnan.c -o /tmp/isnan $math >/dev/null 2>&1
if [ $? = 0 ]
then NOISNAN=

2
prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc.hp-ux

@ -18,7 +18,7 @@ mkdir bin bin/$PLATFORM >/dev/null 2>&1
echo '#include <stdio.h>'>>/tmp/isnan.c
echo '#include <stdlib.h>'>>/tmp/isnan.c
echo '#include <math.h>'>>/tmp/isnan.c
echo 'main(){isnan(0);}'>>/tmp/isnan.c
echo 'main(){isnan(0.0);}'>>/tmp/isnan.c
$c /tmp/isnan.c -o /tmp/isnan $math >/dev/null 2>&1
if [ $? = 0 ]
then NOISNAN=

2
prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc.osx

@ -18,7 +18,7 @@ mkdir bin bin/$PLATFORM >/dev/null 2>&1
echo '#include <stdio.h>'>>/tmp/isnan.c
echo '#include <stdlib.h>'>>/tmp/isnan.c
echo '#include <math.h>'>>/tmp/isnan.c
echo 'main(){isnan(0);}'>>/tmp/isnan.c
echo 'main(){isnan(0.0);}'>>/tmp/isnan.c
$c -arch i386 /tmp/isnan.c -o /tmp/isnan $math >/dev/null 2>&1
if [ $? = 0 ]
then NOISNAN=

2
prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc.osx64

@ -18,7 +18,7 @@ mkdir bin bin/$PLATFORM >/dev/null 2>&1
echo '#include <stdio.h>'>>/tmp/isnan.c
echo '#include <stdlib.h>'>>/tmp/isnan.c
echo '#include <math.h>'>>/tmp/isnan.c
echo 'main(){isnan(0);}'>>/tmp/isnan.c
echo 'main(){isnan(0.0);}'>>/tmp/isnan.c
$c -arch x86_64 /tmp/isnan.c -o /tmp/isnan $math >/dev/null 2>&1
if [ $? = 0 ]
then NOISNAN=

2
prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc.solaris

@ -18,7 +18,7 @@ mkdir bin bin/$PLATFORM >/dev/null 2>&1
echo '#include <stdio.h>'>>/tmp/isnan.c
echo '#include <stdlib.h>'>>/tmp/isnan.c
echo '#include <math.h>'>>/tmp/isnan.c
echo 'main(){isnan(0);}'>>/tmp/isnan.c
echo 'main(){isnan(0.0);}'>>/tmp/isnan.c
$c /tmp/isnan.c -o /tmp/isnan $math >/dev/null 2>&1
if [ $? = 0 ]
then NOISNAN=

2
prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/cccLUSOL.osx

@ -17,7 +17,7 @@ mkdir bin bin/$PLATFORM >/dev/null 2>&1
echo '#include <stdio.h>'>>/tmp/isnan.c
echo '#include <stdlib.h>'>>/tmp/isnan.c
echo '#include <math.h>'>>/tmp/isnan.c
echo 'main(){isnan(0);}'>>/tmp/isnan.c
echo 'main(){isnan(0.0);}'>>/tmp/isnan.c
$c /tmp/isnan.c -o /tmp/isnan $math >/dev/null 2>&1
if [ $? = 0 ]
then NOISNAN=

Loading…
Cancel
Save