diff options
| author | gerald <gerald@FreeBSD.org> | 2016-08-22 21:20:47 +0800 |
|---|---|---|
| committer | gerald <gerald@FreeBSD.org> | 2016-08-22 21:20:47 +0800 |
| commit | aa19f7c348f7f3c01fc14c4cb09e30d62a647f67 (patch) | |
| tree | 8437ad27a080806cea6b2f42f227720a5bc57174 /lang | |
| parent | 9d40e1e2a215057cd39f573da1c0d0956229b9f1 (diff) | |
| download | freebsd-ports-gnome-aa19f7c348f7f3c01fc14c4cb09e30d62a647f67.tar.gz freebsd-ports-gnome-aa19f7c348f7f3c01fc14c4cb09e30d62a647f67.tar.zst freebsd-ports-gnome-aa19f7c348f7f3c01fc14c4cb09e30d62a647f67.zip | |
Update to the GCC 6.2 release with a fair number of fixes.
files/patch-armv6-hf-support has been accepted upstream, even
on the GCC 6-branch this release comes from, so remove it.
Backport the following from lang/gcc6-devel:
GCC uses an AWK script to generate source code that helps process
command-line options. According to POSIX, string comparisons (and
hence sorting) are to be performed based on the locale's collating
order. Alas GNU AWK only does so in POSIX mode, whereas starting
with FreeBSD 11 we do so by default, running into a bug (or false
assumption) with that script used by GCC.
Setting MAKE_ARGS such that AWK is always invoked in the C locale
works around this bug. [1]
PR: 210122 [1], 211742 [1]
Submitted by: jkim [1]
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/gcc6/Makefile | 7 | ||||
| -rw-r--r-- | lang/gcc6/distinfo | 5 | ||||
| -rw-r--r-- | lang/gcc6/files/patch-armv6-hf-support | 18 |
3 files changed, 8 insertions, 22 deletions
diff --git a/lang/gcc6/Makefile b/lang/gcc6/Makefile index a3a9e831cbc7..4aec349e0365 100644 --- a/lang/gcc6/Makefile +++ b/lang/gcc6/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gcc -PORTVERSION= 6.1.0 +PORTVERSION= 6.2.0 CATEGORIES= lang java MASTER_SITES= GCC/releases/gcc-${DISTVERSION} PKGNAMESUFFIX= ${SUFFIX} @@ -106,7 +106,10 @@ CONFIGURE_ARGS+=--disable-nls \ ${ICONV_CONFIGURE_ARG} \ --with-pkgversion="FreeBSD Ports Collection" \ --with-system-zlib -MAKE_ARGS+= MAKEINFOFLAGS="--no-split" +# On FreeBSD 11 and above AWK uses the locale's collating order which +# runs into a bug in GCC (PR 211742). +MAKE_ARGS+= MAKEINFOFLAGS="--no-split" \ + AWK="${SETENV} LC_ALL=C ${AWK:Q}" USE_LDCONFIG= ${TARGLIB} PLIST_SUB= GCC_VERSION=${GCC_VERSION} \ GNU_HOST=${CONFIGURE_TARGET} \ diff --git a/lang/gcc6/distinfo b/lang/gcc6/distinfo index 9d8c740d76e4..cf2beaab873c 100644 --- a/lang/gcc6/distinfo +++ b/lang/gcc6/distinfo @@ -1,2 +1,3 @@ -SHA256 (gcc-6.1.0.tar.bz2) = 09c4c85cabebb971b1de732a0219609f93fc0af5f86f6e437fd8d7f832f1a351 -SIZE (gcc-6.1.0.tar.bz2) = 99267556 +TIMESTAMP = 1471862430 +SHA256 (gcc-6.2.0.tar.bz2) = 9944589fc722d3e66308c0ce5257788ebd7872982a718aa2516123940671b7c5 +SIZE (gcc-6.2.0.tar.bz2) = 99778648 diff --git a/lang/gcc6/files/patch-armv6-hf-support b/lang/gcc6/files/patch-armv6-hf-support deleted file mode 100644 index 9352e2cdfcc0..000000000000 --- a/lang/gcc6/files/patch-armv6-hf-support +++ /dev/null @@ -1,18 +0,0 @@ ---- UTC ---- gcc/config.gcc.orig 2016-05-25 22:53:15.930993000 +0200 -+++ gcc/config.gcc 2016-05-25 22:54:06.087115000 +0200 -@@ -1026,11 +1026,9 @@ - case $target in - armv6*-*-freebsd*) - tm_defines="${tm_defines} TARGET_FREEBSD_ARMv6=1" -- ;; -- esac -- case $target in -- arm*hf-*-freebsd*) -- tm_defines="${tm_defines} TARGET_FREEBSD_ARM_HARD_FLOAT=1" -+ if test $fbsd_major -ge 11; then -+ tm_defines="${tm_defines} TARGET_FREEBSD_ARM_HARD_FLOAT=1" -+ fi - ;; - esac - with_tls=${with_tls:-gnu} |