From owner-freebsd-current@FreeBSD.ORG Fri Feb 22 17:00:15 2008 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BAC5A16A406 for ; Fri, 22 Feb 2008 17:00:15 +0000 (UTC) (envelope-from kaiwang27@gmail.com) Received: from nf-out-0910.google.com (nf-out-0910.google.com [64.233.182.189]) by mx1.freebsd.org (Postfix) with ESMTP id AF27113C447 for ; Fri, 22 Feb 2008 17:00:14 +0000 (UTC) (envelope-from kaiwang27@gmail.com) Received: by nf-out-0910.google.com with SMTP id b2so301378nfb.33 for ; Fri, 22 Feb 2008 09:00:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:received:received:x-authentication-warning:date:from:to:cc:subject:message-id:mail-followup-to:references:mime-version:content-type:content-disposition:in-reply-to:user-agent; bh=4vz842VZWirlf84dOtv/9QwL3whAWUcIV3P3+GQyxPM=; b=KJu5tIHDvGeZ4by/QuikdCrZw+4B+gb/6HK1cFvw6f1rrdnC/Ghu8daO2UMt1GZcopXjnpXEgc4eibCKmDs7DpTpyObOj0g7oHhRImGZBfOF0YbI8gK/La8kcnYijxuCtRdf2wt/bA7ugvQInfXr5rWtc5qPLFdGU1QlwZx9XF8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=x-authentication-warning:date:from:to:cc:subject:message-id:mail-followup-to:references:mime-version:content-type:content-disposition:in-reply-to:user-agent; b=g9GQp6E/KwMSrSSzWP7m8q6WdtCz4ULfQAGOqaaA1HxVS7ahoNH7yN/bJCiy78qSeFICxMK6+YYOQnWMU7yhsIXF15uzkrDv41dWWuUrzOnZ/MB/AZxx//KkV5e+hi4rdxA0jq+aQkypv+1gW9NUhGV9nIfeFKuWEjZqrHilelI= Received: by 10.78.129.16 with SMTP id b16mr448571hud.3.1203699612143; Fri, 22 Feb 2008 09:00:12 -0800 (PST) Received: from plan0.kaiwan.csbnet.se ( [193.11.244.12]) by mx.google.com with ESMTPS id z37sm2582250ikz.1.2008.02.22.09.00.09 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 22 Feb 2008 09:00:10 -0800 (PST) Received: from localhost ([127.0.0.1] helo=plan0.kaiwan.csbnet.se) by plan0.kaiwan.csbnet.se with esmtp (Exim 4.69 (FreeBSD)) (envelope-from ) id 1JSbFo-0000hS-2Y; Fri, 22 Feb 2008 18:00:08 +0100 Received: (from kaffir@localhost) by plan0.kaiwan.csbnet.se (8.14.2/8.14.2/Submit) id m1MH07mc002693; Fri, 22 Feb 2008 18:00:07 +0100 (CET) (envelope-from kaiwang27@gmail.com) X-Authentication-Warning: plan0.kaiwan.csbnet.se: kaffir set sender to kaiwang27@gmail.com using -f Date: Fri, 22 Feb 2008 18:00:07 +0100 From: Kai Wang To: Ruslan Ermilov Message-ID: <20080222170007.GA2622@plan0.kaiwan.csbnet.se> Mail-Followup-To: Ruslan Ermilov , obrien@freebsd.org, "Dag-Erling C. Smorgrav" , Joseph Koshy , current@freebsd.org References: <20080221140247.GC2022@plan0.kaiwan.csbnet.se> <20080221143351.GP57756@deviant.kiev.zoral.com.ua> <20080221152549.GB21518@team.vega.ru> <20080221173150.GA93693@dragon.NUXI.org> <20080222070728.GA56282@team.vega.ru> <20080222091642.GB57428@team.vega.ru> <20080222093234.GB17107@dragon.NUXI.org> <20080222102409.GD57428@team.vega.ru> <20080222105413.GD94607@team.vega.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20080222105413.GD94607@team.vega.ru> User-Agent: Mutt/1.5.17 (2007-11-01) Cc: Joseph Koshy , "Dag-Erling C. Smorgrav" , current@freebsd.org Subject: Re: [HEADS UP] ar(1) front-end committed. (notes for cross compile) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Feb 2008 17:00:15 -0000 On Fri, Feb 22, 2008 at 01:54:13PM +0300, Ruslan Ermilov wrote: > Here's an updated patch. It differs in that we don't > bootstrap BSD ar(1) if we were told to build WITH_GNUAR, > and we don't install BSD ar(1) with "bsd" prefixes if > it's to be the system ar(1) (requested by David). > > > Cheers, > -- > Ruslan Ermilov > ru@FreeBSD.org > FreeBSD committer > Index: sys/sys/param.h > =================================================================== > RCS file: /home/ncvs/src/sys/sys/param.h,v > retrieving revision 1.337 > diff -u -p -r1.337 param.h > --- sys/sys/param.h 21 Feb 2008 16:12:46 -0000 1.337 > +++ sys/sys/param.h 22 Feb 2008 07:43:33 -0000 > @@ -57,7 +57,7 @@ > * is created, otherwise 1. > */ > #undef __FreeBSD_version > -#define __FreeBSD_version 800021 /* Master, propagated to newvers */ > +#define __FreeBSD_version 800022 /* Master, propagated to newvers */ > > #ifndef LOCORE > #include > Index: Makefile.inc1 > =================================================================== > RCS file: /home/ncvs/src/Makefile.inc1,v > retrieving revision 1.598 > diff -u -p -r1.598 Makefile.inc1 > --- Makefile.inc1 5 Feb 2008 15:41:58 -0000 1.598 > +++ Makefile.inc1 22 Feb 2008 10:02:05 -0000 > @@ -885,8 +885,13 @@ _crunchgen= usr.sbin/crunch/crunchgen > _mklocale= usr.bin/mklocale > .endif > > +.if ${BOOTSTRAPPING} >= 800022 && !defined(WITH_GNUAR) > +_ar= usr.bin/ar > +.endif > + > bootstrap-tools: > .for _tool in \ > + ${_ar} \ > ${_mklocale} \ > ${_strfile} \ > ${_gperf} \ > @@ -967,6 +972,10 @@ _kgzip= usr.sbin/kgzip > .endif > .endif > > +.if make(cross-tools) && ${BOOTSTRAPPING} < 800022 > +.MAKEFLAGS+= -DWITH_GNUAR > +.endif > + > cross-tools: > .for _tool in \ > gnu/usr.bin/binutils \ > Index: gnu/usr.bin/binutils/ar/Makefile > =================================================================== > RCS file: /home/ncvs/src/gnu/usr.bin/binutils/ar/Makefile,v > retrieving revision 1.16 > diff -u -p -r1.16 Makefile > --- gnu/usr.bin/binutils/ar/Makefile 21 Feb 2008 16:59:02 -0000 1.16 > +++ gnu/usr.bin/binutils/ar/Makefile 22 Feb 2008 06:56:10 -0000 > @@ -4,12 +4,15 @@ > > .PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc > > -.if defined(WITH_BSDAR) > -PROG= gnu-ar > -#MAN= gnu-ar.1 > -.else > -PROG= ar > +.if !defined(WITH_GNUAR) > +PROGNAME= gnu-ar Would it be better if we call them gar and granlib? Solaris did that. Also if I remember correctly, some ports probes gar. We also call GNU make as gmake... -- Kai