complibs/ppl: fix 0.11-0.11.2 to compile with --disable-shared
PPL 0.11 (through 0.11.2) had a small bug where it still tried to build
and test its Java interface even when shared libraries are disabled.
Since that's exactly what ct-ng does, it explodes.
This is the patch from the PPL authors (see final link below).
More information can be found in these messages/threads:
Anthony's initial report and analysis with Yann:
http://www.cygwin.com/ml/crossgcc/2011-05/msg00046.html
Ron Flory hit the same problem:
http://www.cygwin.com/ml/crossgcc/2011-05/msg00054.html
Anthony's report to the ppl-devel list:
http://www.cs.unipr.it/pipermail/ppl-devel/2011-May/017450.html
Roberto's reply with a link to the fix in the PPL git repo:
http://www.cs.unipr.it/pipermail/ppl-devel/2011-May/017455.html
Signed-Off-By: Anthony Foiani <anthony.foiani@gmail.com>
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/patches/ppl/0.11.1/100-fix-java-test-vs-enabled-shared.patch Thu May 19 23:09:43 2011 +0200
1.3 @@ -0,0 +1,28 @@
1.4 +commit 25bb77587944768581225d1c0048facab32cf019
1.5 +Author: Roberto Bagnara <bagnara@cs.unipr.it>
1.6 +Date: Wed May 18 09:35:36 2011 +0200
1.7 +
1.8 + Moved misplaced conditional.
1.9 +
1.10 +diff --git a/interfaces/Java/tests/Makefile.am b/interfaces/Java/tests/Makefile.am
1.11 +index 64ba864..607bbc6 100644
1.12 +--- a/interfaces/Java/tests/Makefile.am
1.13 ++++ b/interfaces/Java/tests/Makefile.am
1.14 +@@ -51,6 +51,8 @@ Parma_Polyhedra_Library_test2.java \
1.15 + PPL_Test.java \
1.16 + ppl_java_tests_common
1.17 +
1.18 ++if ENABLE_SHARED
1.19 ++
1.20 + check_JAVA = \
1.21 + ppl_java_generated_tests.java \
1.22 + Test_Executor.java \
1.23 +@@ -62,8 +64,6 @@ Parma_Polyhedra_Library_test1.java \
1.24 + Parma_Polyhedra_Library_test2.java \
1.25 + PPL_Test.java
1.26 +
1.27 +-if ENABLE_SHARED
1.28 +-
1.29 + CLASSPATH = ../ppl_java.jar:.
1.30 + JAVACFLAGS = -classpath $(CLASSPATH)
1.31 +
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2.2 +++ b/patches/ppl/0.11.2/100-fix-java-test-vs-enabled-shared.patch Thu May 19 23:09:43 2011 +0200
2.3 @@ -0,0 +1,28 @@
2.4 +commit 25bb77587944768581225d1c0048facab32cf019
2.5 +Author: Roberto Bagnara <bagnara@cs.unipr.it>
2.6 +Date: Wed May 18 09:35:36 2011 +0200
2.7 +
2.8 + Moved misplaced conditional.
2.9 +
2.10 +diff --git a/interfaces/Java/tests/Makefile.am b/interfaces/Java/tests/Makefile.am
2.11 +index 64ba864..607bbc6 100644
2.12 +--- a/interfaces/Java/tests/Makefile.am
2.13 ++++ b/interfaces/Java/tests/Makefile.am
2.14 +@@ -51,6 +51,8 @@ Parma_Polyhedra_Library_test2.java \
2.15 + PPL_Test.java \
2.16 + ppl_java_tests_common
2.17 +
2.18 ++if ENABLE_SHARED
2.19 ++
2.20 + check_JAVA = \
2.21 + ppl_java_generated_tests.java \
2.22 + Test_Executor.java \
2.23 +@@ -62,8 +64,6 @@ Parma_Polyhedra_Library_test1.java \
2.24 + Parma_Polyhedra_Library_test2.java \
2.25 + PPL_Test.java
2.26 +
2.27 +-if ENABLE_SHARED
2.28 +-
2.29 + CLASSPATH = ../ppl_java.jar:.
2.30 + JAVACFLAGS = -classpath $(CLASSPATH)
2.31 +
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
3.2 +++ b/patches/ppl/0.11/100-fix-java-test-vs-enabled-shared.patch Thu May 19 23:09:43 2011 +0200
3.3 @@ -0,0 +1,28 @@
3.4 +commit 25bb77587944768581225d1c0048facab32cf019
3.5 +Author: Roberto Bagnara <bagnara@cs.unipr.it>
3.6 +Date: Wed May 18 09:35:36 2011 +0200
3.7 +
3.8 + Moved misplaced conditional.
3.9 +
3.10 +diff --git a/interfaces/Java/tests/Makefile.am b/interfaces/Java/tests/Makefile.am
3.11 +index 64ba864..607bbc6 100644
3.12 +--- a/interfaces/Java/tests/Makefile.am
3.13 ++++ b/interfaces/Java/tests/Makefile.am
3.14 +@@ -51,6 +51,8 @@ Parma_Polyhedra_Library_test2.java \
3.15 + PPL_Test.java \
3.16 + ppl_java_tests_common
3.17 +
3.18 ++if ENABLE_SHARED
3.19 ++
3.20 + check_JAVA = \
3.21 + ppl_java_generated_tests.java \
3.22 + Test_Executor.java \
3.23 +@@ -62,8 +64,6 @@ Parma_Polyhedra_Library_test1.java \
3.24 + Parma_Polyhedra_Library_test2.java \
3.25 + PPL_Test.java
3.26 +
3.27 +-if ENABLE_SHARED
3.28 +-
3.29 + CLASSPATH = ../ppl_java.jar:.
3.30 + JAVACFLAGS = -classpath $(CLASSPATH)
3.31 +