diff options
| author | marino <marino@FreeBSD.org> | 2014-04-10 16:45:30 +0800 |
|---|---|---|
| committer | marino <marino@FreeBSD.org> | 2014-04-10 16:45:30 +0800 |
| commit | 27877f01bdfe7854460440e545d3e32bdcea0b3e (patch) | |
| tree | c9fe3d6b4e90ca2efc780c8fcfb5f892c0c313d4 /lang/gcc-aux | |
| parent | 1dc5be30aa5e05f3659fc41f57244fce711f7d3a (diff) | |
| download | freebsd-ports-graphics-27877f01bdfe7854460440e545d3e32bdcea0b3e.tar.gz freebsd-ports-graphics-27877f01bdfe7854460440e545d3e32bdcea0b3e.tar.zst freebsd-ports-graphics-27877f01bdfe7854460440e545d3e32bdcea0b3e.zip | |
lang/gcc-aux: Add binutils requirement for FreeBSD
This patch was previously developed but lost somewhere along the way.
The linker and assembly must be explicitly defined otherwise it is
defined as "ld" and "as" and as such is affected by the value of PATH.
We don't want this, and it actually breaks the gnatdroid cross compilers.
For FreeBSD, use the binutils port like the gcc ports do. DragonFly
has binutils 2.24 in base so let's keep using the base binutils on that
platform.
Also the Makefile.version file now defines the PORTREVISION for all
the ports that use it to make future updating easier.
Binutils patch omission partly detected by jenkins failure (thx swills)
Diffstat (limited to 'lang/gcc-aux')
| -rw-r--r-- | lang/gcc-aux/Makefile | 7 | ||||
| -rw-r--r-- | lang/gcc-aux/Makefile.version | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/lang/gcc-aux/Makefile b/lang/gcc-aux/Makefile index ebc1b8d2914..c3215570512 100644 --- a/lang/gcc-aux/Makefile +++ b/lang/gcc-aux/Makefile @@ -3,6 +3,7 @@ PORTNAME= gcc-aux PORTVERSION= ${SNAPSHOT} +PORTREVISION= ${MAIN_PR} CATEGORIES= lang MASTER_SITES= http://downloads.dragonlace.net/src/:boot \ LOCAL/marino:boot ${MASTER_SITE_GCC} @@ -46,6 +47,10 @@ BOOTSTRAP_DESC= Create bootstrap compiler (overrides other options) .include <bsd.port.options.mk> .if ${OPSYS} == FreeBSD +USE_BINUTILS= yes +RUN_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils +EXTRA_CONFIG+= --with-ld=${LOCALBASE}/bin/ld +EXTRA_CONFIG+= --with-as=${LOCALBASE}/bin/as . if ${OSVERSION} < 900000 BOOTSTRAP_COMPILER= ada-bootstrap.${GARCH}.freebsd.84.tar.bz2 . else @@ -53,6 +58,8 @@ BOOTSTRAP_COMPILER= ada-bootstrap.${GARCH}.freebsd.100B.tar.bz2 . endif .endif .if ${OPSYS} == DragonFly +EXTRA_CONFIG+= --with-ld=/usr/bin/ld +EXTRA_CONFIG+= --with-as=/usr/bin/as BOOTSTRAP_COMPILER= ada-bootstrap.${GARCH}.dragonfly.36A.tar.bz2 .endif diff --git a/lang/gcc-aux/Makefile.version b/lang/gcc-aux/Makefile.version index d82208b800f..8b0b88e2f77 100644 --- a/lang/gcc-aux/Makefile.version +++ b/lang/gcc-aux/Makefile.version @@ -4,6 +4,9 @@ GCC_BRANCH= 4.9 GCC_POINT= 0 GCC_VERSION= ${GCC_BRANCH}.${GCC_POINT} SNAPSHOT= 20140406 +MAIN_PR= 1 +ARMV5_PR= 1 +ARMV7_PR= 1 IDENTIFICATION= gcc-${GCC_BRANCH}-${SNAPSHOT} MS_SUBDIR= snapshots/${GCC_BRANCH}-${SNAPSHOT} |