summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Foiani <anthony.foiani@gmail.com>2011-05-19 21:09:43 (GMT)
committerAnthony Foiani <anthony.foiani@gmail.com>2011-05-19 21:09:43 (GMT)
commit48c5423871546992314f2b8b21afa2ca46016399 (patch)
treedf178fae674ca48d492076d76235db6048e294d0
parent5c2c3358734fc6eddc45d7a6e2f0107a8c24afbe (diff)
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> (transplanted from 139b85d70b623e51f7585e7c64ecb8c6a6cf4567)
-rw-r--r--patches/ppl/0.11.1/100-fix-java-test-vs-enabled-shared.patch28
-rw-r--r--patches/ppl/0.11.2/100-fix-java-test-vs-enabled-shared.patch28
-rw-r--r--patches/ppl/0.11/100-fix-java-test-vs-enabled-shared.patch28
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 0000000..12a72e8
--- /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 0000000..12a72e8
--- /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 0000000..12a72e8
--- /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)
+