patches/gcc/4.4.2/240-libstdc++-pic.patch
author Anthony Foiani <anthony.foiani@gmail.com>
Thu May 19 23:09:43 2011 +0200 (2011-05-19)
changeset 2462 139b85d70b62
parent 1544 2228ea3f6b79
permissions -rw-r--r--
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 diff -durN gcc-4.4.0.orig/libstdc++-v3/src/Makefile.am gcc-4.4.0/libstdc++-v3/src/Makefile.am
     2 --- gcc-4.4.0.orig/libstdc++-v3/src/Makefile.am	2009-04-10 01:23:07.000000000 +0200
     3 +++ gcc-4.4.0/libstdc++-v3/src/Makefile.am	2009-05-27 21:38:34.000000000 +0200
     4 @@ -351,6 +351,13 @@
     5  	  $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@
     6  
     7  
     8 +install-exec-local:
     9 +	pic_objs=`sed -n "s:'::g;s:^pic_object=::p" *.lo | grep -v '^none$$'`; \
    10 +	if [ x"$$pic_objs" != x ]; then \
    11 +		$(AR) cru libstdc++_pic.a $$pic_objs $(top_builddir)/libsupc++/*.o || exit 1; \
    12 +		$(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) || exit 1; \
    13 +	fi
    14 +
    15  # Added bits to build debug library.
    16  if GLIBCXX_BUILD_DEBUG
    17  all-local: build_debug
    18 diff -durN gcc-4.4.0.orig/libstdc++-v3/src/Makefile.in gcc-4.4.0/libstdc++-v3/src/Makefile.in
    19 --- gcc-4.4.0.orig/libstdc++-v3/src/Makefile.in	2009-01-17 03:03:25.000000000 +0100
    20 +++ gcc-4.4.0/libstdc++-v3/src/Makefile.in	2009-05-27 21:38:34.000000000 +0200
    21 @@ -726,7 +726,7 @@
    22  
    23  install-data-am: install-data-local
    24  
    25 -install-exec-am: install-toolexeclibLTLIBRARIES
    26 +install-exec-am: install-toolexeclibLTLIBRARIES install-exec-local
    27  
    28  install-info: install-info-am
    29  
    30 @@ -765,7 +765,7 @@
    31  	maintainer-clean-generic mostlyclean mostlyclean-compile \
    32  	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
    33  	tags uninstall uninstall-am uninstall-info-am \
    34 -	uninstall-toolexeclibLTLIBRARIES
    35 +	uninstall-toolexeclibLTLIBRARIES install-exec-local
    36  
    37  
    38  # Symbol versioning for shared libraries.
    39 @@ -942,6 +942,14 @@
    40  install_debug:
    41  	(cd ${debugdir} && $(MAKE) \
    42  	toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
    43 +
    44 +install-exec-local:
    45 +	pic_objs=`sed -n "s:'::g;s:^pic_object=::p" *.lo | grep -v '^none$$'`; \
    46 +	if [ x"$$pic_objs" != x ]; then \
    47 +		$(AR) cru libstdc++_pic.a $$pic_objs $(top_builddir)/libsupc++/*.o || exit 1; \
    48 +		$(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) || exit 1; \
    49 +	fi
    50 +
    51  # Tell versions [3.59,3.63) of GNU make to not export all variables.
    52  # Otherwise a system limit (for SysV at least) may be exceeded.
    53  .NOEXPORT: