sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-17 17:29:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not quote constant strings compared with ${ARCH}. [1] Remove

Browse source 
some commented (and thus disabled) logic around this on the way.

This brings the active lang/gcc* release-based ports in sync with
their respective lang/gcc*-devel twins.

PR:		221905 [1]
Submitted by:	linimon [1]
This commit is contained in:
Gerald Pfeifer 2017-09-17 17:51:24 +00:00
parent 09b025405d
commit aa36701d51
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=450008
3 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lang/gcc5/Makefile
View file

@ -62,7 +62,7 @@ CONFIGURE_ARGS+= --disable-multilib
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${ARCH} == "amd64" .if ${ARCH} == amd64
CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL} CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL}
.endif .endif
@ -70,7 +70,7 @@ CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL}
CONFIGURE_ENV+= UNAME_m="powerpc64" CONFIGURE_ENV+= UNAME_m="powerpc64"
.endif .endif
.if ${ARCH} == "aarch64" || ${ARCH} == "armv6" .if ${ARCH} == aarch64 || ${ARCH} == armv6
. if ${COMPILER_TYPE} == clang . if ${COMPILER_TYPE} == clang
. if empty(PORT_OPTIONS:MBOOTSTRAP) . if empty(PORT_OPTIONS:MBOOTSTRAP)
MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512 MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512
@ -116,10 +116,8 @@ INFO= gcc${SUFFIX}/cpp \
gcc${SUFFIX}/gfortran \ gcc${SUFFIX}/gfortran \
gcc${SUFFIX}/libgomp gcc${SUFFIX}/libgomp
# Release tarballs (as opposed to snapshots) always carry this. # Release tarballs (as opposed to snapshots) always carry this.
#.if ${ARCH} == "amd64" || ${ARCH} == "i386"
INFO+= gcc${SUFFIX}/libquadmath \ INFO+= gcc${SUFFIX}/libquadmath \
gcc${SUFFIX}/libitm gcc${SUFFIX}/libitm
#.endif
SUB_FILES= pkg-message SUB_FILES= pkg-message
SUB_LIST+= TARGLIB=${TARGLIB} SUB_LIST+= TARGLIB=${TARGLIB}

6
lang/gcc6/Makefile
View file

@ -62,7 +62,7 @@ CONFIGURE_ARGS+= --disable-multilib
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${ARCH} == "amd64" .if ${ARCH} == amd64
CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL} CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL}
.endif .endif
@ -71,7 +71,7 @@ CONFIGURE_ENV+= UNAME_m="powerpc64"
USE_GCC= 5 # Cannot require ourselves, needs to be at least 4.9. USE_GCC= 5 # Cannot require ourselves, needs to be at least 4.9.
.endif .endif
.if ${ARCH} == "aarch64" || ${ARCH} == "armv6" .if ${ARCH} == aarch64 || ${ARCH} == armv6
. if ${COMPILER_TYPE} == clang . if ${COMPILER_TYPE} == clang
. if empty(PORT_OPTIONS:MBOOTSTRAP) . if empty(PORT_OPTIONS:MBOOTSTRAP)
MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512 MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512
@ -117,10 +117,8 @@ INFO= gcc${SUFFIX}/cpp \
gcc${SUFFIX}/gfortran \ gcc${SUFFIX}/gfortran \
gcc${SUFFIX}/libgomp gcc${SUFFIX}/libgomp
# Release tarballs (as opposed to snapshots) always carry this. # Release tarballs (as opposed to snapshots) always carry this.
#.if ${ARCH} == "amd64" || ${ARCH} == "i386"
INFO+= gcc${SUFFIX}/libquadmath \ INFO+= gcc${SUFFIX}/libquadmath \
gcc${SUFFIX}/libitm gcc${SUFFIX}/libitm
#.endif
SUB_FILES= pkg-message SUB_FILES= pkg-message
SUB_LIST+= TARGLIB=${TARGLIB} SUB_LIST+= TARGLIB=${TARGLIB}

6
lang/gcc7/Makefile
View file

@ -51,7 +51,7 @@ CONFIGURE_ARGS+= --disable-multilib
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${ARCH} == "amd64" .if ${ARCH} == amd64
CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL} CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL}
.endif .endif
@ -60,7 +60,7 @@ CONFIGURE_ENV+= UNAME_m="powerpc64"
USE_GCC= yes USE_GCC= yes
.endif .endif
.if ${ARCH} == "armv6" .if ${ARCH} == armv6
. if ${COMPILER_TYPE} == clang . if ${COMPILER_TYPE} == clang
. if empty(PORT_OPTIONS:MBOOTSTRAP) . if empty(PORT_OPTIONS:MBOOTSTRAP)
MAKE_ARGS+=CXXFLAGS+=-fbracket-depth=512 MAKE_ARGS+=CXXFLAGS+=-fbracket-depth=512
@ -106,10 +106,8 @@ INFO= gcc${SUFFIX}/cpp \
gcc${SUFFIX}/gfortran \ gcc${SUFFIX}/gfortran \
gcc${SUFFIX}/libgomp gcc${SUFFIX}/libgomp
# Release tarballs (as opposed to snapshots) always carry this. # Release tarballs (as opposed to snapshots) always carry this.
#.if ${ARCH} == "amd64" || ${ARCH} == "i386"
INFO+= gcc${SUFFIX}/libquadmath \ INFO+= gcc${SUFFIX}/libquadmath \
gcc${SUFFIX}/libitm gcc${SUFFIX}/libitm
#.endif
SUB_FILES= pkg-message SUB_FILES= pkg-message
SUB_LIST+= TARGLIB=${TARGLIB} SUB_LIST+= TARGLIB=${TARGLIB}