diff options
| author | Anthony Foiani <anthony.foiani@gmail.com> | 2011-05-19 23:09:43 +0200 |
|---|---|---|
| committer | Anthony Foiani <anthony.foiani@gmail.com> | 2011-05-19 23:09:43 +0200 |
| commit | e109ca92a0df15421fa57c47092a8b53ce069c9f (patch) | |
| tree | 9cc3e596c138b8788a8456ee15afe2327cf7175d /patches | |
| parent | 3555e0326885663007b862ae9a71565200e7f9a8 (diff) | |
| download | crosstool-ng-e109ca92a0df15421fa57c47092a8b53ce069c9f.tar.gz crosstool-ng-e109ca92a0df15421fa57c47092a8b53ce069c9f.tar.bz2 crosstool-ng-e109ca92a0df15421fa57c47092a8b53ce069c9f.zip | |
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>
Diffstat (limited to 'patches')
3 files changed, 84 insertions, 0 deletions
diff --git a/patches/ppl/0.11.1/100-fix-java-test-vs-enabled-shared.patch b/patches/ppl/0.11.1/100-fix-java-test-vs-enabled-shared.patch new file mode 100644 index 00000000..12a72e8f --- /dev/null +++ b/patches/ppl/0.11.1/100-fix-java-test-vs-enabled-shared.patch @@ -0,0 +1,28 @@ +commit 25bb77587944768581225d1c0048facab32cf019 +Author: Roberto Bagnara <bagnara@cs.unipr.it> +Date: Wed May 18 09:35:36 2011 +0200 + + Moved misplaced conditional. + +diff --git a/interfaces/Java/tests/Makefile.am b/interfaces/Java/tests/Makefile.am +index 64ba864..607bbc6 100644 +--- a/interfaces/Java/tests/Makefile.am ++++ b/interfaces/Java/tests/Makefile.am +@@ -51,6 +51,8 @@ Parma_Polyhedra_Library_test2.java \ + PPL_Test.java \ + ppl_java_tests_common + ++if ENABLE_SHARED ++ + check_JAVA = \ + ppl_java_generated_tests.java \ + Test_Executor.java \ +@@ -62,8 +64,6 @@ Parma_Polyhedra_Library_test1.java \ + Parma_Polyhedra_Library_test2.java \ + PPL_Test.java + +-if ENABLE_SHARED +- + CLASSPATH = ../ppl_java.jar:. + JAVACFLAGS = -classpath $(CLASSPATH) + diff --git a/patches/ppl/0.11.2/100-fix-java-test-vs-enabled-shared.patch b/patches/ppl/0.11.2/100-fix-java-test-vs-enabled-shared.patch new file mode 100644 index 00000000..12a72e8f --- /dev/null +++ b/patches/ppl/0.11.2/100-fix-java-test-vs-enabled-shared.patch @@ -0,0 +1,28 @@ +commit 25bb77587944768581225d1c0048facab32cf019 +Author: Roberto Bagnara <bagnara@cs.unipr.it> +Date: Wed May 18 09:35:36 2011 +0200 + + Moved misplaced conditional. + +diff --git a/interfaces/Java/tests/Makefile.am b/interfaces/Java/tests/Makefile.am +index 64ba864..607bbc6 100644 +--- a/interfaces/Java/tests/Makefile.am ++++ b/interfaces/Java/tests/Makefile.am +@@ -51,6 +51,8 @@ Parma_Polyhedra_Library_test2.java \ + PPL_Test.java \ + ppl_java_tests_common + ++if ENABLE_SHARED ++ + check_JAVA = \ + ppl_java_generated_tests.java \ + Test_Executor.java \ +@@ -62,8 +64,6 @@ Parma_Polyhedra_Library_test1.java \ + Parma_Polyhedra_Library_test2.java \ + PPL_Test.java + +-if ENABLE_SHARED +- + CLASSPATH = ../ppl_java.jar:. + JAVACFLAGS = -classpath $(CLASSPATH) + diff --git a/patches/ppl/0.11/100-fix-java-test-vs-enabled-shared.patch b/patches/ppl/0.11/100-fix-java-test-vs-enabled-shared.patch new file mode 100644 index 00000000..12a72e8f --- /dev/null +++ b/patches/ppl/0.11/100-fix-java-test-vs-enabled-shared.patch @@ -0,0 +1,28 @@ +commit 25bb77587944768581225d1c0048facab32cf019 +Author: Roberto Bagnara <bagnara@cs.unipr.it> +Date: Wed May 18 09:35:36 2011 +0200 + + Moved misplaced conditional. + +diff --git a/interfaces/Java/tests/Makefile.am b/interfaces/Java/tests/Makefile.am +index 64ba864..607bbc6 100644 +--- a/interfaces/Java/tests/Makefile.am ++++ b/interfaces/Java/tests/Makefile.am +@@ -51,6 +51,8 @@ Parma_Polyhedra_Library_test2.java \ + PPL_Test.java \ + ppl_java_tests_common + ++if ENABLE_SHARED ++ + check_JAVA = \ + ppl_java_generated_tests.java \ + Test_Executor.java \ +@@ -62,8 +64,6 @@ Parma_Polyhedra_Library_test1.java \ + Parma_Polyhedra_Library_test2.java \ + PPL_Test.java + +-if ENABLE_SHARED +- + CLASSPATH = ../ppl_java.jar:. + JAVACFLAGS = -classpath $(CLASSPATH) + |