diff options
| author | gerald <gerald@FreeBSD.org> | 2017-02-04 00:00:56 +0800 |
|---|---|---|
| committer | gerald <gerald@FreeBSD.org> | 2017-02-04 00:00:56 +0800 |
| commit | 89411e929386ccc83db2ae18397a35369e2ac595 (patch) | |
| tree | bf8512443604a6476dd28f96a030df64ae5457b6 | |
| parent | 05692911e442b7f1c6d429d276378d304f41d356 (diff) | |
| download | freebsd-ports-gnome-89411e929386ccc83db2ae18397a35369e2ac595.tar.gz freebsd-ports-gnome-89411e929386ccc83db2ae18397a35369e2ac595.tar.zst freebsd-ports-gnome-89411e929386ccc83db2ae18397a35369e2ac595.zip | |
Remove traces of armv6hf which no longer exists as an arch. [1]
Remove an extraneous definition of DISTVERSION (which in general we
only need for ports tracking weekly GCC snapshots) and simplify the
definition of GCC_VERSION.
Reported by: andreast [1]
| -rw-r--r-- | lang/gcc/Makefile | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile index 1b3f6acc2a1c..1b7644fab29d 100644 --- a/lang/gcc/Makefile +++ b/lang/gcc/Makefile @@ -25,12 +25,11 @@ BUILD_DEPENDS+= runtest:misc/dejagnu CONFLICTS= gcc49* CPE_VENDOR= gnu -# DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names -# of executables and directories once installed. -DISTVERSION= ${PORTVERSION} -GCC_VERSION= ${PORTVERSION:C/(.+)\.[0-9]{8}/\1/} +# GCC_VERSION and SUFFIX relate to names of executables and directories +# once installed. +GCC_VERSION= ${PORTVERSION} SUFFIX= ${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/} -ONLY_FOR_ARCHS= amd64 armv6 armv6hf i386 powerpc powerpc64 sparc64 +ONLY_FOR_ARCHS= amd64 armv6 i386 powerpc powerpc64 sparc64 USES= compiler cpe gmake iconv libtool makeinfo perl5 tar:bzip2 USE_BINUTILS= yes USE_PERL5= build @@ -65,7 +64,7 @@ CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL} CONFIGURE_ENV+= UNAME_m="powerpc64" .endif -.if ${ARCH} == "armv6" || ${ARCH} == "armv6hf" +.if ${ARCH} == "armv6" # Override sys.mk including -O in CFLAGS which breaks libgomp building. CFLAGS:= ${CFLAGS:S/-O/-O2/g} . if ${COMPILER_TYPE} == clang |