On Wed, 19 Aug 2015 10:17:00 +0100, Stuart Henderson wrote:
> On 2015/08/19 08:44, Pascal Stumpf wrote:
> > On Tue, 18 Aug 2015 04:16:55 -0600 (MDT), Stuart Henderson wrote:
> > > CVSROOT: /cvs
> > > Module name: ports
> > > Changes by: [email protected] 2015/08/18 04:16:55
> > >
> > > Modified files:
> > > lang/gcc/4.9 : Makefile
> > >
> > > Log message:
> > > add a comment pointing out that NO_xx flavours are broken, to avoid people
> > > trying to do a quick build by disabling things they don't need, only to
> > > have
> > > it fail when packaging -libs
> > >
> > >
> >
> > To be precise: no_c++ has been nonsensical a long time (4.7), and
> > no_ada/no_java still work. I think I could delete no_objc and no_f95
> > since they don't do much for reducing build time anyway.
>
> Please do - anything listed in FLAVORS/PSEUDO_FLAVORS ought to work or
> be removed. Thanks!
>
>
Tentative diff, will test once I get home:
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/gcc/4.9/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile 18 Aug 2015 10:16:55 -0000 1.18
+++ Makefile 19 Aug 2015 09:59:15 -0000
@@ -30,8 +30,6 @@ PKGNAME-f95 = g95-${FULL_PKGVERSION}
PKGNAME-java = gcj-${FULL_PKGVERSION}
PKGNAME-objc = gobjc-${FULL_PKGVERSION}
PKGNAME-ada = gnat-${FULL_PKGVERSION}
-# needs [gs]etcontext
-#PKGNAME-go = gccgo-${FULL_PKGVERSION}
PKGSPEC-main = gcc->=4.9,<4.10
SHARED_LIBS = estdc++ 17.0 \
@@ -48,10 +46,7 @@ SHARED_LIBS = estdc++ 17.0 \
quadmath 1.0 \
cilkrts 0.0
-# XXX the BUILD_PACKAGES / PSEUDO_FLAVORS setup is broken because
-# XXX the no_* flavours disable building files which are included in
-# XXX the common -libs package.
-PSEUDO_FLAVORS = no_c++ no_f95 no_objc no_java no_ada no_go full
+PSEUDO_FLAVORS = no_java no_ada full
FLAVOR ?=
ONLY_FOR_ARCHS-ada = amd64 i386 sparc64 hppa
@@ -63,11 +58,6 @@ MAINTAINER = Pascal Stumpf <Pascal.Stump
.include <bsd.port.arch.mk>
-# kill both C++ subpackages
-.if !${BUILD_PACKAGES:M-c++}
-BUILD_PACKAGES := ${BUILD_PACKAGES:N-estdc}
-.endif
-
DISTNAME = gcc-${FULL_VERSION}
DISTFILES = ${DISTNAME}.tar.bz2
# there's no ecj-4.9.jar
@@ -80,7 +70,8 @@ BUILD_DEPENDS += devel/bison \
devel/libexecinfo
TEST_DEPENDS = devel/dejagnu \
- devel/autogen
+ devel/autogen \
+ ${BUILD_PKGPATH},-libs>=4.9,<4.10
MASTER_SITES = ${MASTER_SITE_GCC:=releases/gcc-$(FULL_VERSION)/}
MASTER_SITES0 = http://spacehopper.org/mirrors/ \
@@ -88,17 +79,7 @@ MASTER_SITES0 = http://spacehopper.org/m
https://distfiles.bsdfrog.org/
MASTER_SITES1 = ftp://sources.redhat.com/pub/java/
-LANGS = c
-.if ${BUILD_PACKAGES:M-c++}
-LANGS := ${LANGS},c++
-TEST_DEPENDS += ${BUILD_PKGPATH},-libs>=4.9,<4.10
-.endif
-.if ${BUILD_PACKAGES:M-f95}
-LANGS := ${LANGS},fortran
-.endif
-.if ${BUILD_PACKAGES:M-objc}
-LANGS := ${LANGS},objc
-.endif
+LANGS = c,c++,fortran,objc
.if ${BUILD_PACKAGES:M-java}
LANGS := ${LANGS},java
DISTFILES += ${ECJ}:1
@@ -114,9 +95,6 @@ CC = ${WRKDIR}/bin/egcc
CXX = ${WRKDIR}/bin/eg++
TEST_DEPENDS += ${BUILD_PKGPATH},-ada
.endif
-#.if ${BUILD_PACKAGES:M-go}
-#LANGS := ${LANGS},go
-#.endif
CONFIGURE_STYLE = gnu
MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC} ${WRKSRC}/gcc
