svn commit: r327052 - in head/lang: gcc gcc34 gcc42 gcc44 gcc46 gcc47 gcc48 gcc49

John Marino marino at FreeBSD.org
Thu Sep 12 10:20:47 UTC 2013


Author: marino
Date: Thu Sep 12 10:20:45 2013
New Revision: 327052
URL: http://svnweb.freebsd.org/changeset/ports/327052

Log:
  lang/gcc*: define CONFIGURE_TARGET genericly (8 ports)
  
  Instead of hardcoding the compiler target as FreeBSD, use the OPSYS
  variable to it.  This makes no practical difference for FreeBSD, but
  it helps DragonFly get properly configured.
  
  Approved by:	gerald

Modified:
  head/lang/gcc/Makefile
  head/lang/gcc34/Makefile
  head/lang/gcc42/Makefile
  head/lang/gcc44/Makefile
  head/lang/gcc46/Makefile
  head/lang/gcc47/Makefile
  head/lang/gcc48/Makefile
  head/lang/gcc49/Makefile

Modified: head/lang/gcc/Makefile
==============================================================================
--- head/lang/gcc/Makefile	Thu Sep 12 10:17:57 2013	(r327051)
+++ head/lang/gcc/Makefile	Thu Sep 12 10:20:45 2013	(r327052)
@@ -46,9 +46,9 @@ BOOTSTRAP_DESC=		Build using a full boot
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
-CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:L}${OSREL}
 .else
-CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	${ARCH}-portbld-${OPSYS:L}${OSREL}
 .endif
 
 LANGUAGES:=	c,c++,objc,fortran

Modified: head/lang/gcc34/Makefile
==============================================================================
--- head/lang/gcc34/Makefile	Thu Sep 12 10:17:57 2013	(r327051)
+++ head/lang/gcc34/Makefile	Thu Sep 12 10:20:45 2013	(r327052)
@@ -35,9 +35,9 @@ BROKEN=		Does not compile on FreeBSD 10.
 .endif
 
 .if ${ARCH} == "amd64"
-CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:L}${OSREL}
 .else
-CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	${ARCH}-portbld-${OPSYS:L}${OSREL}
 .endif
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}

Modified: head/lang/gcc42/Makefile
==============================================================================
--- head/lang/gcc42/Makefile	Thu Sep 12 10:17:57 2013	(r327051)
+++ head/lang/gcc42/Makefile	Thu Sep 12 10:20:45 2013	(r327052)
@@ -34,9 +34,9 @@ CONFIGURE_SCRIPT=	../${SRCDIR:S/${WRKDIR
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
-CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:L}${OSREL}
 .else
-CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	${ARCH}-portbld-${OPSYS:L}${OSREL}
 .endif
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}

Modified: head/lang/gcc44/Makefile
==============================================================================
--- head/lang/gcc44/Makefile	Thu Sep 12 10:17:57 2013	(r327051)
+++ head/lang/gcc44/Makefile	Thu Sep 12 10:20:45 2013	(r327052)
@@ -32,9 +32,9 @@ CONFIGURE_SCRIPT=	../${SRCDIR:S/${WRKDIR
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
-CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:L}${OSREL}
 .else
-CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	${ARCH}-portbld-${OPSYS:L}${OSREL}
 .endif
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}

Modified: head/lang/gcc46/Makefile
==============================================================================
--- head/lang/gcc46/Makefile	Thu Sep 12 10:17:57 2013	(r327051)
+++ head/lang/gcc46/Makefile	Thu Sep 12 10:20:45 2013	(r327052)
@@ -48,9 +48,9 @@ BOOTSTRAP_DESC=		Build using a full boot
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
-CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:L}${OSREL}
 .else
-CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	${ARCH}-portbld-${OPSYS:L}${OSREL}
 .endif
 
 LANGUAGES:=	c,c++,objc,fortran

Modified: head/lang/gcc47/Makefile
==============================================================================
--- head/lang/gcc47/Makefile	Thu Sep 12 10:17:57 2013	(r327051)
+++ head/lang/gcc47/Makefile	Thu Sep 12 10:20:45 2013	(r327052)
@@ -48,9 +48,9 @@ BOOTSTRAP_DESC=		Build using a full boot
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
-CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:L}${OSREL}
 .else
-CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	${ARCH}-portbld-${OPSYS:L}${OSREL}
 .endif
 
 .if ${ARCH} == powerpc64

Modified: head/lang/gcc48/Makefile
==============================================================================
--- head/lang/gcc48/Makefile	Thu Sep 12 10:17:57 2013	(r327051)
+++ head/lang/gcc48/Makefile	Thu Sep 12 10:20:45 2013	(r327052)
@@ -48,9 +48,9 @@ BOOTSTRAP_DESC=		Build using a full boot
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
-CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:L}${OSREL}
 .else
-CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	${ARCH}-portbld-${OPSYS:L}${OSREL}
 .endif
 
 .if ${ARCH} == powerpc64

Modified: head/lang/gcc49/Makefile
==============================================================================
--- head/lang/gcc49/Makefile	Thu Sep 12 10:17:57 2013	(r327051)
+++ head/lang/gcc49/Makefile	Thu Sep 12 10:20:45 2013	(r327052)
@@ -48,9 +48,9 @@ BOOTSTRAP_DESC=		Build using a full boot
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
-CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:L}${OSREL}
 .else
-CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	${ARCH}-portbld-${OPSYS:L}${OSREL}
 .endif
 
 .if ${ARCH} == powerpc64


More information about the svn-ports-all mailing list