From 7cb9ce5788110081fd9a7014d2887f2ff2aecf47 Mon Sep 17 00:00:00 2001 From: Joachim Klein Date: Wed, 24 Feb 2016 12:23:29 +0000 Subject: [PATCH] =?UTF-8?q?[lpsolve]=20fix=20compilation=20issue=20in=20re?= =?UTF-8?q?lation=20to=20isnan=20[with=20Sascha=20Wunderlich,=20David=20M?= =?UTF-8?q?=C3=BCller]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- prism/ext/lpsolve55/src/lp_solve_5.5/lp_solve/ccc | 2 +- prism/ext/lpsolve55/src/lp_solve_5.5/lp_solve/ccc.osx | 2 +- prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc | 2 +- prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc.aix | 2 +- prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc.cygwin | 2 +- prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc.hp-ux | 2 +- prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc.osx | 2 +- prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc.osx64 | 2 +- prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc.solaris | 2 +- prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/cccLUSOL.osx | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/prism/ext/lpsolve55/src/lp_solve_5.5/lp_solve/ccc b/prism/ext/lpsolve55/src/lp_solve_5.5/lp_solve/ccc index 35b89fbf..e76b48b0 100644 --- a/prism/ext/lpsolve55/src/lp_solve_5.5/lp_solve/ccc +++ b/prism/ext/lpsolve55/src/lp_solve_5.5/lp_solve/ccc @@ -20,7 +20,7 @@ math=-lm echo '#include '>>/tmp/isnan.c echo '#include '>>/tmp/isnan.c echo '#include '>>/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= diff --git a/prism/ext/lpsolve55/src/lp_solve_5.5/lp_solve/ccc.osx b/prism/ext/lpsolve55/src/lp_solve_5.5/lp_solve/ccc.osx index 0066636a..e7def8e0 100644 --- a/prism/ext/lpsolve55/src/lp_solve_5.5/lp_solve/ccc.osx +++ b/prism/ext/lpsolve55/src/lp_solve_5.5/lp_solve/ccc.osx @@ -20,7 +20,7 @@ math=-lm echo '#include '>>/tmp/isnan.c echo '#include '>>/tmp/isnan.c echo '#include '>>/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= diff --git a/prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc b/prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc index 4ec2d232..64a37758 100644 --- a/prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc +++ b/prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc @@ -28,7 +28,7 @@ mkdir bin bin/$PLATFORM >/dev/null 2>&1 echo '#include '>>/tmp/isnan.c echo '#include '>>/tmp/isnan.c echo '#include '>>/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= diff --git a/prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc.aix b/prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc.aix index 692e805a..8fac7af8 100644 --- a/prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc.aix +++ b/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 '>>/tmp/isnan.c echo '#include '>>/tmp/isnan.c echo '#include '>>/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= diff --git a/prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc.cygwin b/prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc.cygwin index 46694367..c342c76c 100644 --- a/prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc.cygwin +++ b/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 '>>/tmp/isnan.c echo '#include '>>/tmp/isnan.c echo '#include '>>/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= diff --git a/prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc.hp-ux b/prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc.hp-ux index f86fd6b0..61c45bd4 100644 --- a/prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc.hp-ux +++ b/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 '>>/tmp/isnan.c echo '#include '>>/tmp/isnan.c echo '#include '>>/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= diff --git a/prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc.osx b/prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc.osx index 738168f5..8b274165 100644 --- a/prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc.osx +++ b/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 '>>/tmp/isnan.c echo '#include '>>/tmp/isnan.c echo '#include '>>/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= diff --git a/prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc.osx64 b/prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc.osx64 index 37c7dad5..c0ecdb2c 100644 --- a/prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc.osx64 +++ b/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 '>>/tmp/isnan.c echo '#include '>>/tmp/isnan.c echo '#include '>>/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= diff --git a/prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc.solaris b/prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc.solaris index 34c85635..3f7f2d95 100644 --- a/prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc.solaris +++ b/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 '>>/tmp/isnan.c echo '#include '>>/tmp/isnan.c echo '#include '>>/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= diff --git a/prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/cccLUSOL.osx b/prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/cccLUSOL.osx index b3977cac..45dec02d 100644 --- a/prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/cccLUSOL.osx +++ b/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 '>>/tmp/isnan.c echo '#include '>>/tmp/isnan.c echo '#include '>>/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=