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

Backport a number of changes from lang/gcc5 and lang/gcc49:

Browse source 
- Move ONLY_FOR_ARCHS into the right position of the Makefile.

 - Omit a comment describing GCC_VERSION and SUFFIX.

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

 - Last, but not least the only functional change (and an important one):
   Remove headers being created by GCC's fixincludes machinery from
   the installation / packaging to avoid breakage when FreeBSD's headers
   are changing afterwards. [2]

PR:		221905 [1], 222233 [2]
Submitted by:	linimon [1]
This commit is contained in:
Gerald Pfeifer 2017-09-22 13:05:17 +00:00
parent 2b341a9f46
commit f8aba5dada
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=450370
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lang/gcc48/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= gcc PORTNAME= gcc
PORTVERSION= 4.8.5 PORTVERSION= 4.8.5
PORTREVISION= 4 PORTREVISION= 5
CATEGORIES= lang CATEGORIES= lang
MASTER_SITES= GCC/releases/gcc-${PORTVERSION} MASTER_SITES= GCC/releases/gcc-${PORTVERSION}
PKGNAMESUFFIX= ${SUFFIX} PKGNAMESUFFIX= ${SUFFIX}
@ -14,6 +14,8 @@ COMMENT= GNU Compiler Collection 4.8
LICENSE= GPLv3 GPLv3RLE LICENSE= GPLv3 GPLv3RLE
LICENSE_COMB= multi LICENSE_COMB= multi
ONLY_FOR_ARCHS= amd64 armv6 i386 powerpc powerpc64 sparc64
LIB_DEPENDS= libgmp.so:math/gmp \ LIB_DEPENDS= libgmp.so:math/gmp \
libmpfr.so:math/mpfr \ libmpfr.so:math/mpfr \
libmpc.so:math/mpc libmpc.so:math/mpc
@ -26,11 +28,8 @@ BUILD_DEPENDS+= runtest:misc/dejagnu
CPE_VENDOR= gnu CPE_VENDOR= gnu
# GCC_VERSION and SUFFIX relate to names of executables and directories
# once installed.
GCC_VERSION= ${PORTVERSION} GCC_VERSION= ${PORTVERSION}
SUFFIX= ${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/} SUFFIX= ${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
ONLY_FOR_ARCHS= amd64 armv6 i386 powerpc powerpc64 sparc64
USES= compiler cpe gmake iconv libtool makeinfo perl5 tar:bzip2 USES= compiler cpe gmake iconv libtool makeinfo perl5 tar:bzip2
USE_BINUTILS= yes USE_BINUTILS= yes
USE_PERL5= build USE_PERL5= build
@ -51,7 +50,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
@ -59,7 +58,7 @@ CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL}
CONFIGURE_ENV+= UNAME_m="powerpc64" CONFIGURE_ENV+= UNAME_m="powerpc64"
.endif .endif
.if ${ARCH} == "armv6" .if ${ARCH} == armv6
# Override sys.mk including -O in CFLAGS which breaks libgomp building. # Override sys.mk including -O in CFLAGS which breaks libgomp building.
CFLAGS:= ${CFLAGS:S/-O/-O2/g} CFLAGS:= ${CFLAGS:S/-O/-O2/g}
. if ${COMPILER_TYPE} == clang . if ${COMPILER_TYPE} == clang
@ -128,6 +127,7 @@ full-regression-test: build
post-stage: post-stage:
${RM} ${STAGEDIR}${PREFIX}/man/man7/* ${RM} ${STAGEDIR}${PREFIX}/man/man7/*
${RM} -r ${STAGEDIR}${TARGLIB}/gcc/*/${GCC_VERSION}/include-fixed/
# Add target libraries and include files to packaging list. # Add target libraries and include files to packaging list.
${RM} ${WRKDIR}/PLIST.lib ${RM} ${WRKDIR}/PLIST.lib
.for d in ${TARGLIB:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///} .for d in ${TARGLIB:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///}