From owner-svn-ports-all@freebsd.org Sun Nov 8 20:13:56 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7ED06A29F54; Sun, 8 Nov 2015 20:13:56 +0000 (UTC) (envelope-from antoine.brodin.freebsd@gmail.com) Received: from mail-io0-x22e.google.com (mail-io0-x22e.google.com [IPv6:2607:f8b0:4001:c06::22e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C12E19CC; Sun, 8 Nov 2015 20:13:56 +0000 (UTC) (envelope-from antoine.brodin.freebsd@gmail.com) Received: by iodd200 with SMTP id d200so168068617iod.0; Sun, 08 Nov 2015 12:13:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=+IIYQ5N2y+ms7ciOKh+gMyNKgP/hSjIB2BNGQgxKT9s=; b=IpS9bXYSU5wh+gAAzYqOFGwwYu0sDncb/72Ej0KwUaEg+jBzHQCU5RbQflOz7+ap+m AkyFFd7bXurs+OA6LKFT8MKUFO07EnsZW4y8ysX67jcaGObKV5o30eNsRE0aYWBReEnQ erx3VD+TWk2WbnwIeKq6DpIJJ/IhT4S5Hf4HxZ7ROzPsjGj9WrqTWiiqas2sP/iio9tY VOWtXafQpUUmnrkuQ6RxbD6AUfAiTljjU8omnVdCOhi4nT7ChIwcGucRAJxS/y+njwIn vZRAB9tYWqQRRiu3C+6iO8noJpYHRpMarZt+0X9Vl6g5wjhGwF3I6pgd43YeT/4ISgJD 4FPw== MIME-Version: 1.0 X-Received: by 10.107.38.70 with SMTP id m67mr27007993iom.98.1447013635588; Sun, 08 Nov 2015 12:13:55 -0800 (PST) Sender: antoine.brodin.freebsd@gmail.com Received: by 10.107.32.145 with HTTP; Sun, 8 Nov 2015 12:13:55 -0800 (PST) In-Reply-To: <201511082010.tA8KA0KU085113@repo.freebsd.org> References: <201511082010.tA8KA0KU085113@repo.freebsd.org> Date: Sun, 8 Nov 2015 21:13:55 +0100 X-Google-Sender-Auth: 8-yY7Esf31gGCmX6PEnB72CUWjo Message-ID: Subject: Re: svn commit: r401072 - in head/lang: gcc gcc48 gcc49 gcc5 From: Antoine Brodin To: Julio Merino Cc: "ports-committers@freebsd.org" , "svn-ports-all@freebsd.org" , "svn-ports-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Nov 2015 20:13:56 -0000 On Sun, Nov 8, 2015 at 9:10 PM, Julio Merino wrote: > Author: jmmv (src committer) > Date: Sun Nov 8 20:09:59 2015 > New Revision: 401072 > URL: https://svnweb.freebsd.org/changeset/ports/401072 > > Log: > Add a MULTILIB option to gcc{,48,49,5} for powerpc64 Hi, This adds the option for amd64 too, is it intended? Cheers, Antoine > > This change is the same as r400632, which updated gcc[56]-devel, but now > for gcc{,48,49,5}. Waited a week to ensure the change caused nothing to go > horribly wrong but this change is very low risk because it only affects > powerpc64. > > This fixes the build of gcc{,48,49,5} under powerpc64 when the system > is built without the lib32 libraries. > > More in detail: > > If the system is built with lib32 support (WITH_LIB32, which is the default), > building gcc from ports results in a compiler that can target both 64-bit and > 32-bit binaries on powerpc64. However, when lib32 support is disabled > (WITHOUT_LIB32), gcc should only be built with 64-bit support or otherwise > the build fails. > > To fix this, explicitly disable 32-bit support when /usr/lib32 is not present > and add a MULTILIB option (which is only defined for powerpc64 when 32-bit > support is possible and defaults to yes to preserve the current behavior) to > allow the user to explicitly control this feature. > > Approved by: gerald (maintainer), bdrewery (mentor), andreast > Differential Revision: https://reviews.freebsd.org/D3952 > > 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:09:02 2015 (r401071) > +++ head/lang/gcc/Makefile Sun Nov 8 20:09:59 2015 (r401072) > @@ -3,6 +3,7 @@ > > PORTNAME= gcc > PORTVERSION= 4.8.5 > +PORTREVISION= 1 > CATEGORIES= lang java > MASTER_SITES= GCC/releases/gcc-${DISTVERSION} > > @@ -46,6 +47,14 @@ 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 > > > Modified: head/lang/gcc48/Makefile > ============================================================================== > --- head/lang/gcc48/Makefile Sun Nov 8 20:09:02 2015 (r401071) > +++ head/lang/gcc48/Makefile Sun Nov 8 20:09:59 2015 (r401072) > @@ -3,6 +3,7 @@ > > PORTNAME= gcc > PORTVERSION= 4.8.5 > +PORTREVISION= 1 > CATEGORIES= lang java > MASTER_SITES= GCC/releases/gcc-${DISTVERSION} > PKGNAMESUFFIX= ${SUFFIX} > @@ -49,6 +50,14 @@ 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 > > > Modified: head/lang/gcc49/Makefile > ============================================================================== > --- head/lang/gcc49/Makefile Sun Nov 8 20:09:02 2015 (r401071) > +++ head/lang/gcc49/Makefile Sun Nov 8 20:09:59 2015 (r401072) > @@ -3,6 +3,7 @@ > > PORTNAME= gcc > PORTVERSION= 4.9.4.s20151028 > +PORTREVISION= 1 > CATEGORIES= lang java > MASTER_SITES= GCC/snapshots/${DISTVERSION} > PKGNAMESUFFIX= ${SUFFIX} > @@ -50,6 +51,14 @@ 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 > > > Modified: head/lang/gcc5/Makefile > ============================================================================== > --- head/lang/gcc5/Makefile Sun Nov 8 20:09:02 2015 (r401071) > +++ head/lang/gcc5/Makefile Sun Nov 8 20:09:59 2015 (r401072) > @@ -3,7 +3,7 @@ > > PORTNAME= gcc > PORTVERSION= 5.2.0 > -PORTREVISION= 1 > +PORTREVISION= 2 > CATEGORIES= lang java > MASTER_SITES= GCC/releases/gcc-${DISTVERSION} > PKGNAMESUFFIX= ${SUFFIX} > @@ -52,6 +52,15 @@ 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 > > .if ${ARCH} == "amd64" >