svn commit: r401074 - in head/lang: gcc gcc48 gcc49 gcc5
Julio Merino
jmmv at FreeBSD.org
Sun Nov 8 20:31:53 UTC 2015
Author: jmmv (src committer)
Date: Sun Nov 8 20:31:51 2015
New Revision: 401074
URL: https://svnweb.freebsd.org/changeset/ports/401074
Log:
Revert r401072.
I'm not sure what happened exactly but I think I committed the change from
the wrong client. The applied change enabled the MULTILIB option for all
architectures and not only powerpc64. Let's just revert the commit and do
it properly from scratch; other things might be wrong so I wanna take a
closer look, and it's best to just revert quickly.
Modified:
head/lang/gcc/Makefile
head/lang/gcc48/Makefile
head/lang/gcc49/Makefile
head/lang/gcc5/Makefile
Modified: head/lang/gcc/Makefile
==============================================================================
--- head/lang/gcc/Makefile Sun Nov 8 20:20:51 2015 (r401073)
+++ head/lang/gcc/Makefile Sun Nov 8 20:31:51 2015 (r401074)
@@ -3,7 +3,6 @@
PORTNAME= gcc
PORTVERSION= 4.8.5
-PORTREVISION= 1
CATEGORIES= lang java
MASTER_SITES= GCC/releases/gcc-${DISTVERSION}
@@ -47,14 +46,6 @@ OPTIONS_DEFAULT_i386= JAVA
OPTIONS_DEFAULT_amd64= JAVA
OPTIONS_EXCLUDE_DragonFly= JAVA
BOOTSTRAP_DESC= Build using a full bootstrap
-.if exists(/usr/lib32/libc.so)
-OPTIONS_DEFINE+= MULTILIB
-OPTIONS_DEFAULT+= MULTILIB
-MULTILIB_DESC= Build support for 32-bit and 64-bit target types
-MULTILIB_CONFIGURE_ENABLE= multilib
-.else
-CONFIGURE_ARGS+= --disable-multilib
-.endif
.include <bsd.port.pre.mk>
Modified: head/lang/gcc48/Makefile
==============================================================================
--- head/lang/gcc48/Makefile Sun Nov 8 20:20:51 2015 (r401073)
+++ head/lang/gcc48/Makefile Sun Nov 8 20:31:51 2015 (r401074)
@@ -3,7 +3,6 @@
PORTNAME= gcc
PORTVERSION= 4.8.5
-PORTREVISION= 1
CATEGORIES= lang java
MASTER_SITES= GCC/releases/gcc-${DISTVERSION}
PKGNAMESUFFIX= ${SUFFIX}
@@ -50,14 +49,6 @@ OPTIONS_DEFAULT_i386= JAVA
OPTIONS_DEFAULT_amd64= JAVA
OPTIONS_EXCLUDE_DragonFly= JAVA
BOOTSTRAP_DESC= Build using a full bootstrap
-.if exists(/usr/lib32/libc.so)
-OPTIONS_DEFINE+= MULTILIB
-OPTIONS_DEFAULT+= MULTILIB
-MULTILIB_DESC= Build support for 32-bit and 64-bit target types
-MULTILIB_CONFIGURE_ENABLE= multilib
-.else
-CONFIGURE_ARGS+= --disable-multilib
-.endif
.include <bsd.port.pre.mk>
Modified: head/lang/gcc49/Makefile
==============================================================================
--- head/lang/gcc49/Makefile Sun Nov 8 20:20:51 2015 (r401073)
+++ head/lang/gcc49/Makefile Sun Nov 8 20:31:51 2015 (r401074)
@@ -3,7 +3,6 @@
PORTNAME= gcc
PORTVERSION= 4.9.4.s20151028
-PORTREVISION= 1
CATEGORIES= lang java
MASTER_SITES= GCC/snapshots/${DISTVERSION}
PKGNAMESUFFIX= ${SUFFIX}
@@ -51,14 +50,6 @@ OPTIONS_DEFAULT_i386= JAVA
OPTIONS_DEFAULT_amd64= JAVA
OPTIONS_EXCLUDE_DragonFly= JAVA
BOOTSTRAP_DESC= Build using a full bootstrap
-.if exists(/usr/lib32/libc.so)
-OPTIONS_DEFINE+= MULTILIB
-OPTIONS_DEFAULT+= MULTILIB
-MULTILIB_DESC= Build support for 32-bit and 64-bit target types
-MULTILIB_CONFIGURE_ENABLE= multilib
-.else
-CONFIGURE_ARGS+= --disable-multilib
-.endif
.include <bsd.port.pre.mk>
Modified: head/lang/gcc5/Makefile
==============================================================================
--- head/lang/gcc5/Makefile Sun Nov 8 20:20:51 2015 (r401073)
+++ head/lang/gcc5/Makefile Sun Nov 8 20:31:51 2015 (r401074)
@@ -3,7 +3,7 @@
PORTNAME= gcc
PORTVERSION= 5.2.0
-PORTREVISION= 2
+PORTREVISION= 1
CATEGORIES= lang java
MASTER_SITES= GCC/releases/gcc-${DISTVERSION}
PKGNAMESUFFIX= ${SUFFIX}
@@ -52,15 +52,6 @@ OPTIONS_DEFAULT_amd64= JAVA
OPTIONS_EXCLUDE_DragonFly= JAVA
BOOTSTRAP_DESC= Build using a full bootstrap
-.if exists(/usr/lib32/libc.so)
-OPTIONS_DEFINE_powerpc64= MULTILIB
-OPTIONS_DEFAULT_powerpc64= MULTILIB
-MULTILIB_DESC= Build support for 32-bit and 64-bit targets
-MULTILIB_CONFIGURE_ENABLE= multilib
-.else
-CONFIGURE_ARGS+= --disable-multilib
-.endif
-
.include <bsd.port.pre.mk>
.if ${ARCH} == "amd64"
More information about the svn-ports-all
mailing list