From owner-freebsd-current@FreeBSD.ORG Fri Feb 22 09:44:22 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 BB2F816A409; Fri, 22 Feb 2008 09:44:22 +0000 (UTC) (envelope-from rermilov@team.vega.ru) Received: from mail.vega.ru (infra.dev.vega.ru [90.156.167.14]) by mx1.freebsd.org (Postfix) with ESMTP id 6BFD413C4CC; Fri, 22 Feb 2008 09:44:21 +0000 (UTC) (envelope-from rermilov@team.vega.ru) Received: from [87.242.97.68] (port=62625 helo=edoofus.dev.vega.ru) by mail.vega.ru with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.68 (FreeBSD)) (envelope-from ) id 1JSUS3-0008yF-Ia; Fri, 22 Feb 2008 09:44:19 +0000 Received: from edoofus.dev.vega.ru (localhost [127.0.0.1]) by edoofus.dev.vega.ru (8.14.2/8.14.2) with ESMTP id m1M9iIJm025087; Fri, 22 Feb 2008 12:44:18 +0300 (MSK) (envelope-from rermilov@team.vega.ru) Received: (from ru@localhost) by edoofus.dev.vega.ru (8.14.2/8.14.2/Submit) id m1M9iIOT025017; Fri, 22 Feb 2008 12:44:18 +0300 (MSK) (envelope-from rermilov@team.vega.ru) X-Authentication-Warning: edoofus.dev.vega.ru: ru set sender to rermilov@team.vega.ru using -f Date: Fri, 22 Feb 2008 12:44:17 +0300 From: Ruslan Ermilov To: obrien@freebsd.org, Kai Wang , "Dag-Erling C. Smorgrav" , Joseph Koshy , current@freebsd.org Message-ID: <20080222094416.GC57428@team.vega.ru> References: <20080221131209.GA2022@plan0.kaiwan.csbnet.se> <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> <20080222092713.GA17107@dragon.NUXI.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20080222092713.GA17107@dragon.NUXI.org> User-Agent: Mutt/1.5.17 (2007-11-01) Cc: 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 09:44:22 -0000 On Fri, Feb 22, 2008 at 01:27:13AM -0800, David O'Brien wrote: > On Fri, Feb 22, 2008 at 12:16:42PM +0300, Ruslan Ermilov wrote: > > RCS file: /home/ncvs/src/usr.bin/Makefile,v > .. > > - ar \ > > + ${_ar} \ > .. > > .if ${MK_TOOLCHAIN} != "no" > > +_ar= ar > > Please commit now - I should have done it this way. > Done. > > RCS file: /home/ncvs/src/usr.bin/ar/Makefile,v > .. > > -.if defined(WITH_BSDAR) > > -PROG= ar > > -.else > > PROG= bsdar > > -.endif > > +LINKS= ${BINDIR}/bsdar ${BINDIR}/bsdranlib > > +MLINKS= bsdar.1 bsdranlib.1 > > LINKS and MLINKS don't belong here in a Makefile - they are better > located where I have them. > The only difference is that I prefer the "product order", while you seem to prefer the "build order". :-) Our versions don't match any of the documented orders in style.Makefile(5) because the conditional block is misplaced. If I move the conditional block from after the first set of links, the order will fully match "product order". I also had a no-op ".else" clause in my patch -- the result of the conflict resolution with your changes. Now it looks like this: : # $FreeBSD: src/usr.bin/ar/Makefile,v 1.19 2008/02/22 06:53:52 obrien Exp $ : : PROG= bsdar : LINKS= ${BINDIR}/bsdar ${BINDIR}/bsdranlib : MLINKS= bsdar.1 bsdranlib.1 : : .if !defined(WITH_GNUAR) : NO_SHARED?= yes : LINKS+= ${BINDIR}/bsdar ${BINDIR}/ar : MLINKS+= bsdar.1 ar.1 : LINKS+= ${BINDIR}/bsdranlib ${BINDIR}/ranlib : MLINKS+= bsdranlib.1 ranlib.1 : .endif : : SRCS= ar.c read.c util.c write.c : : WARNS?= 5 : : DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBELF} : LDADD= -larchive -lbz2 -lz -lelf : : .include > > -NO_SHARED?= yes > > It looks like you're totally removing the NO_SHARED setting, or do you > still have it set when BSD-ar is the default 'ar'? > I think you misread my patch. It's still built statically when it's the default system ar(1), exactly as you programmed it. Cheers, -- Ruslan Ermilov ru@FreeBSD.org FreeBSD committer