ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2024-12-19 21:07:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

complibs/ppl: fix 0.11-0.11.2 to compile with --disable-shared

Browse Source 
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)
This commit is contained in:
Anthony Foiani 2011-05-19 23:09:43 +02:00
parent 5c2c335873
commit 48c5423871
3 changed files with 84 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
patches/ppl/0.11.1/100-fix-java-test-vs-enabled-shared.patch Normal file
View File

@ -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)

28
patches/ppl/0.11.2/100-fix-java-test-vs-enabled-shared.patch Normal file
View File

@ -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)

28
patches/ppl/0.11/100-fix-java-test-vs-enabled-shared.patch Normal file
View File

@ -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)