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)
2 2010-01-06 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
5 * Makefile.tpl (BASE_TARGET_EXPORTS): Only add TARGET_LIB_PATH
6 to $(RPATH_ENVVAR) if bootstrapping.
7 * Makefile.in: Regenerate.
9 diff --git a/Makefile.in b/Makefile.in
10 index e5fa1d3..dbfc1f0 100644
13 @@ -281,7 +281,10 @@ BASE_TARGET_EXPORTS = \
14 STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
15 WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
16 WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
17 - $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
19 + $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
21 + $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
23 RAW_CXX_TARGET_EXPORTS = \
24 $(BASE_TARGET_EXPORTS) \
25 diff --git a/Makefile.tpl b/Makefile.tpl
26 index 15102e5..452d47c 100644
29 @@ -284,7 +284,10 @@ BASE_TARGET_EXPORTS = \
30 STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
31 WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
32 WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
33 - $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
35 + $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
37 + $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
39 RAW_CXX_TARGET_EXPORTS = \
40 $(BASE_TARGET_EXPORTS) \