summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorGerald Pfeifer <gerald@FreeBSD.org>2017-11-23 07:54:09 +0000
committerGerald Pfeifer <gerald@FreeBSD.org>2017-11-23 07:54:09 +0000
commit08a35e4356b5c303bf6b3aee7b4be9cdf09209fb (patch)
treed67420d0ff669cfc7548f1ca1621d5458316a5f8 /lang
parentIgnore on the package builders when default version of python is not 3.6+ (diff)
Update to the 20171122 snapshot of GCC 6.4.1.
On the way, rework the architecture-specific special settings, sorting and using .elif instead of distinct .if sequences. Add a workaround for armv7. [1] Tested by: andreast [1]
Notes
Notes: svn path=/head/; revision=454743
Diffstat (limited to 'lang')
-rw-r--r--lang/gcc6-devel/Makefile14
-rw-r--r--lang/gcc6-devel/distinfo6
2 files changed, 9 insertions, 11 deletions
diff --git a/lang/gcc6-devel/Makefile b/lang/gcc6-devel/Makefile
index a1b6acf12516..c544a4fe9c48 100644
--- a/lang/gcc6-devel/Makefile
+++ b/lang/gcc6-devel/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gcc
-PORTVERSION= 6.4.1.s20171115
+PORTVERSION= 6.4.1.s20171122
CATEGORIES= lang java
MASTER_SITES= GCC/snapshots/${DIST_VERSION}
PKGNAMESUFFIX= ${SUFFIX}-devel
@@ -68,14 +68,8 @@ CONFIGURE_ARGS+= --disable-multilib
.if ${ARCH} == amd64
CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL}
-.endif
-
-.if ${ARCH} == powerpc64
-CONFIGURE_ENV+= UNAME_m="powerpc64"
-USE_GCC= 5 # Cannot require ourselves, needs to be at least 4.9.
-.endif
-.if ${ARCH} == aarch64 || ${ARCH} == armv6
+.elif ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7
. if ${COMPILER_TYPE} == clang
. if empty(PORT_OPTIONS:MBOOTSTRAP)
MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512
@@ -83,6 +77,10 @@ MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512
MAKE_ARGS+=STAGE1_CXXFLAGS=-fbracket-depth=512
. endif
. endif
+
+.elif ${ARCH} == powerpc64
+CONFIGURE_ENV+= UNAME_m="powerpc64"
+USE_GCC= 5 # Cannot require ourselves, needs to be at least 4.9.
.endif
LANGUAGES:= c,c++,objc,fortran
diff --git a/lang/gcc6-devel/distinfo b/lang/gcc6-devel/distinfo
index 98a86d6f3146..587fae3b021c 100644
--- a/lang/gcc6-devel/distinfo
+++ b/lang/gcc6-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1510862336
-SHA256 (gcc-6-20171115.tar.xz) = b6ca076b1928330be6ecf6d421788dc9dd79b1c7bd446f9d4831dc7cf5115369
-SIZE (gcc-6-20171115.tar.xz) = 72608712
+TIMESTAMP = 1511391489
+SHA256 (gcc-6-20171122.tar.xz) = 31fafc3de86bce2e88e78be49fb6e2969090561902565f8a9ab4b487b6bf2563
+SIZE (gcc-6-20171122.tar.xz) = 72605876