Date: Sun, 17 Sep 2017 17:51:24 +0000 (UTC) From: Gerald Pfeifer <gerald@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r450008 - in head/lang: gcc5 gcc6 gcc7 Message-ID: <201709171751.v8HHpOrm073859@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gerald Date: Sun Sep 17 17:51:24 2017 New Revision: 450008 URL: https://svnweb.freebsd.org/changeset/ports/450008 Log: Do not quote constant strings compared with ${ARCH}. [1] Remove 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] Modified: head/lang/gcc5/Makefile head/lang/gcc6/Makefile head/lang/gcc7/Makefile Modified: head/lang/gcc5/Makefile ============================================================================== --- head/lang/gcc5/Makefile Sun Sep 17 15:26:09 2017 (r450007) +++ head/lang/gcc5/Makefile Sun Sep 17 17:51:24 2017 (r450008) @@ -62,7 +62,7 @@ CONFIGURE_ARGS+= --disable-multilib .include <bsd.port.pre.mk> -.if ${ARCH} == "amd64" +.if ${ARCH} == amd64 CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL} .endif @@ -70,7 +70,7 @@ CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL} CONFIGURE_ENV+= UNAME_m="powerpc64" .endif -.if ${ARCH} == "aarch64" || ${ARCH} == "armv6" +.if ${ARCH} == aarch64 || ${ARCH} == armv6 . if ${COMPILER_TYPE} == clang . if empty(PORT_OPTIONS:MBOOTSTRAP) MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512 @@ -116,10 +116,8 @@ INFO= gcc${SUFFIX}/cpp \ gcc${SUFFIX}/gfortran \ gcc${SUFFIX}/libgomp # Release tarballs (as opposed to snapshots) always carry this. -#.if ${ARCH} == "amd64" || ${ARCH} == "i386" INFO+= gcc${SUFFIX}/libquadmath \ gcc${SUFFIX}/libitm -#.endif SUB_FILES= pkg-message SUB_LIST+= TARGLIB=${TARGLIB} Modified: head/lang/gcc6/Makefile ============================================================================== --- head/lang/gcc6/Makefile Sun Sep 17 15:26:09 2017 (r450007) +++ head/lang/gcc6/Makefile Sun Sep 17 17:51:24 2017 (r450008) @@ -62,7 +62,7 @@ CONFIGURE_ARGS+= --disable-multilib .include <bsd.port.pre.mk> -.if ${ARCH} == "amd64" +.if ${ARCH} == amd64 CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL} .endif @@ -71,7 +71,7 @@ CONFIGURE_ENV+= UNAME_m="powerpc64" USE_GCC= 5 # Cannot require ourselves, needs to be at least 4.9. .endif -.if ${ARCH} == "aarch64" || ${ARCH} == "armv6" +.if ${ARCH} == aarch64 || ${ARCH} == armv6 . if ${COMPILER_TYPE} == clang . if empty(PORT_OPTIONS:MBOOTSTRAP) MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512 @@ -117,10 +117,8 @@ INFO= gcc${SUFFIX}/cpp \ gcc${SUFFIX}/gfortran \ gcc${SUFFIX}/libgomp # Release tarballs (as opposed to snapshots) always carry this. -#.if ${ARCH} == "amd64" || ${ARCH} == "i386" INFO+= gcc${SUFFIX}/libquadmath \ gcc${SUFFIX}/libitm -#.endif SUB_FILES= pkg-message SUB_LIST+= TARGLIB=${TARGLIB} Modified: head/lang/gcc7/Makefile ============================================================================== --- head/lang/gcc7/Makefile Sun Sep 17 15:26:09 2017 (r450007) +++ head/lang/gcc7/Makefile Sun Sep 17 17:51:24 2017 (r450008) @@ -51,7 +51,7 @@ CONFIGURE_ARGS+= --disable-multilib .include <bsd.port.pre.mk> -.if ${ARCH} == "amd64" +.if ${ARCH} == amd64 CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL} .endif @@ -60,7 +60,7 @@ CONFIGURE_ENV+= UNAME_m="powerpc64" USE_GCC= yes .endif -.if ${ARCH} == "armv6" +.if ${ARCH} == armv6 . if ${COMPILER_TYPE} == clang . if empty(PORT_OPTIONS:MBOOTSTRAP) MAKE_ARGS+=CXXFLAGS+=-fbracket-depth=512 @@ -106,10 +106,8 @@ INFO= gcc${SUFFIX}/cpp \ gcc${SUFFIX}/gfortran \ gcc${SUFFIX}/libgomp # Release tarballs (as opposed to snapshots) always carry this. -#.if ${ARCH} == "amd64" || ${ARCH} == "i386" INFO+= gcc${SUFFIX}/libquadmath \ gcc${SUFFIX}/libitm -#.endif SUB_FILES= pkg-message SUB_LIST+= TARGLIB=${TARGLIB}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201709171751.v8HHpOrm073859>