Changeset View
Changeset View
Standalone View
Standalone View
lang/gcc/Makefile
# Created by: Gerald Pfeifer <gerald@FreeBSD.org> | # Created by: Gerald Pfeifer <gerald@FreeBSD.org> | ||||
# $FreeBSD$ | # $FreeBSD$ | ||||
PORTNAME= gcc | PORTNAME= gcc | ||||
PORTVERSION= 4.8.5 | PORTVERSION= 4.8.5 | ||||
PORTREVISION= 1 | |||||
CATEGORIES= lang java | CATEGORIES= lang java | ||||
MASTER_SITES= GCC/releases/gcc-${DISTVERSION} | MASTER_SITES= GCC/releases/gcc-${DISTVERSION} | ||||
MAINTAINER= gerald@FreeBSD.org | MAINTAINER= gerald@FreeBSD.org | ||||
COMMENT= GNU Compiler Collection 4.8 | COMMENT= GNU Compiler Collection 4.8 | ||||
LICENSE= GPLv3 GPLv3RLE | LICENSE= GPLv3 GPLv3RLE | ||||
LICENSE_COMB= multi | LICENSE_COMB= multi | ||||
Show All 27 Lines | |||||
OPTIONS_DEFINE= BOOTSTRAP | OPTIONS_DEFINE= BOOTSTRAP | ||||
OPTIONS_DEFINE_i386= JAVA | OPTIONS_DEFINE_i386= JAVA | ||||
OPTIONS_DEFINE_amd64= JAVA | OPTIONS_DEFINE_amd64= JAVA | ||||
OPTIONS_DEFAULT_i386= JAVA | OPTIONS_DEFAULT_i386= JAVA | ||||
OPTIONS_DEFAULT_amd64= JAVA | OPTIONS_DEFAULT_amd64= JAVA | ||||
OPTIONS_EXCLUDE_DragonFly= JAVA | OPTIONS_EXCLUDE_DragonFly= JAVA | ||||
BOOTSTRAP_DESC= Build using a full bootstrap | BOOTSTRAP_DESC= Build using a full bootstrap | ||||
.if exists(/usr/lib32/libc.so) | |||||
OPTIONS_DEFINE+= MULTILIB | |||||
OPTIONS_DEFAULT+= MULTILIB | |||||
MULTILIB_CONFIGURE_ENABLE= multilib | |||||
MULTILIB_DESC= Build support for 32-bit and 64-bit target types | |||||
.endif | |||||
.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} | ||||
.else | .else | ||||
CONFIGURE_TARGET= ${ARCH}-portbld-${OPSYS:tl}${OSREL} | CONFIGURE_TARGET= ${ARCH}-portbld-${OPSYS:tl}${OSREL} | ||||
.endif | .endif | ||||
bdrewery: These can be spelled such as the following, without the PORT_OPTIONS check… | |||||
Not Done Inline ActionsThat would not be correct because MULTILIB_CONFIGURE_ENV=enable_multilib=no would pass the reverse environment variable to the script when the feature is enabled. I have changed this to use MULTILIB_CONFIGURE_ENABLE only. I have also dropped the use of MULTILIB_CONFIGURE_ENV: that was an artifact of a first attempt of my change, but on a second reading of the configure script, this should be unnecessary because --disable-multilib on the command line should have priority. Retrying builds to make sure. jmmv: That would not be correct because `MULTILIB_CONFIGURE_ENV=enable_multilib=no` would pass the… | |||||
bdreweryUnsubmitted Not Done Inline ActionsYes you're right. bdrewery: Yes you're right. | |||||
.if ${ARCH} == powerpc64 | .if ${ARCH} == powerpc64 | ||||
CONFIGURE_ENV+= UNAME_m="powerpc64" | CONFIGURE_ENV+= UNAME_m="powerpc64" | ||||
.endif | .endif | ||||
.if ${ARCH} == "armv6" || ${ARCH} == "armv6hf" | .if ${ARCH} == "armv6" || ${ARCH} == "armv6hf" | ||||
# 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} | ||||
▲ Show 20 Lines • Show All 98 Lines • Show Last 20 Lines |
These can be spelled such as the following, without the PORT_OPTIONS check:
MULTILIB_CONFIGURE_ENV= enable_multilib=no
MULTILIB_CONFIGURE_OFF= --disable-multielib
The same change should be made to all 3 files.