diff options
| author | Gerald Pfeifer <gerald@FreeBSD.org> | 2013-09-04 16:54:13 +0000 |
|---|---|---|
| committer | Gerald Pfeifer <gerald@FreeBSD.org> | 2013-09-04 16:54:13 +0000 |
| commit | f4ecd3423a92a336e90f3d636790050805f8c7ab (patch) | |
| tree | b586096e10c38bc2fff5ec7515ffffbe1d72e01d /lang | |
| parent | Fix build without libstdc++ (diff) | |
Update to the 20130831 snapshot of GCC 4.7.4.
Work around a bug in libcpp that pulls in the optional system iconv
if present instead of relying on the port we actually depend on. [1]
The issue is that /usr/include/iconv.h has #include <stdbool.h> which
in turn, since both are included very late in the game, conflicts with
similar definintions by libcpp itself.
Interestingly enough, lang/gcc46 and lang/gcc48 did not fail under the
same test scenarios and libstdc++ does not seem to require adjustments,
so PR 161417 may not be relevant in full.
PR: 161417 [1]
Notes
Notes:
svn path=/head/; revision=326294
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/gcc47/Makefile | 2 | ||||
| -rw-r--r-- | lang/gcc47/distinfo | 4 | ||||
| -rw-r--r-- | lang/gcc47/files/patch-libcpp | 10 |
3 files changed, 13 insertions, 3 deletions
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile index ec7335366fd2..4b5852bfb834 100644 --- a/lang/gcc47/Makefile +++ b/lang/gcc47/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gcc -PORTVERSION= 4.7.4.20130817 +PORTVERSION= 4.7.4.20130831 CATEGORIES= lang java MASTER_SITES= ${MASTER_SITE_GCC} MASTER_SITE_SUBDIR= snapshots/${DISTVERSION} diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo index a6aa4bc01e57..fcbc6bbcf8c1 100644 --- a/lang/gcc47/distinfo +++ b/lang/gcc47/distinfo @@ -1,2 +1,2 @@ -SHA256 (gcc-4.7-20130817.tar.bz2) = 3752ec9a294ae2d619dc3a7e47e4ce3dfd754a6304a96b6822f8f9697ebd79ea -SIZE (gcc-4.7-20130817.tar.bz2) = 78810078 +SHA256 (gcc-4.7-20130831.tar.bz2) = 6a0cc169b93bcdab26406104bf1d80ae9f6789f28938589de0e3d745c6ed41c0 +SIZE (gcc-4.7-20130831.tar.bz2) = 78797213 diff --git a/lang/gcc47/files/patch-libcpp b/lang/gcc47/files/patch-libcpp new file mode 100644 index 000000000000..80ed1a7f246d --- /dev/null +++ b/lang/gcc47/files/patch-libcpp @@ -0,0 +1,10 @@ +--- libcpp/internal.h 2012-07-30 09:24:59.000000000 +0000 ++++ libcpp/internal.h 2013-09-04 00:41:26.000000000 +0000 +@@ -27,6 +27,7 @@ + #include "cpp-id-data.h" + + #if HAVE_ICONV ++#define __bool_true_false_are_defined + #include <iconv.h> + #else + #define HAVE_ICONV 0 |