From owner-freebsd-current@FreeBSD.ORG Fri Feb 22 10:54:16 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 7D9F916A400; Fri, 22 Feb 2008 10:54:16 +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 2E80413C447; Fri, 22 Feb 2008 10:54:16 +0000 (UTC) (envelope-from rermilov@team.vega.ru) Received: from [87.242.97.68] (port=55934 helo=edoofus.dev.vega.ru) by mail.vega.ru with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.68 (FreeBSD)) (envelope-from ) id 1JSVXi-000094-UI; Fri, 22 Feb 2008 10:54:14 +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 m1MAsDbI094971; Fri, 22 Feb 2008 13:54:13 +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 m1MAsD3w094970; Fri, 22 Feb 2008 13:54:13 +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 13:54:13 +0300 From: Ruslan Ermilov To: obrien@freebsd.org, Kai Wang , "Dag-Erling C. Smorgrav" , Joseph Koshy , current@freebsd.org Message-ID: <20080222105413.GD94607@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> <20080222093234.GB17107@dragon.NUXI.org> <20080222102409.GD57428@team.vega.ru> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="W/nzBZO5zC0uMSeA" Content-Disposition: inline In-Reply-To: <20080222102409.GD57428@team.vega.ru> 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 10:54:16 -0000 --W/nzBZO5zC0uMSeA Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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 --W/nzBZO5zC0uMSeA Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=p 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 +MAN= gnu-ar.1 +gnu-ar.1: ar.1 + cat ${.ALLSRC} > ${.TARGET} +CLEANFILES+= gnu-ar.1 .endif + +PROG= ar SRCS= ar.c not-ranlib.c CFLAGS+= -D_GNU_SOURCE CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils Index: gnu/usr.bin/binutils/ranlib/Makefile =================================================================== RCS file: /home/ncvs/src/gnu/usr.bin/binutils/ranlib/Makefile,v retrieving revision 1.17 diff -u -p -r1.17 Makefile --- gnu/usr.bin/binutils/ranlib/Makefile 21 Feb 2008 16:59:02 -0000 1.17 +++ gnu/usr.bin/binutils/ranlib/Makefile 22 Feb 2008 06:54:04 -0000 @@ -4,12 +4,15 @@ .PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc -.if defined(WITH_BSDAR) -PROG= gnu-ranlib -#MAN= gnu-ranlib.1 -.else -PROG= ranlib +.if !defined(WITH_GNUAR) +PROGNAME= gnu-ranlib +MAN= gnu-ranlib.1 +gnu-ranlib.1: ranlib.1 + cat ${.ALLSRC} > ${.TARGET} +CLEANFILES+= gnu-ranlib.1 .endif + +PROG= ranlib SRCS= ar.c is-ranlib.c CFLAGS+= -D_GNU_SOURCE CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils Index: usr.bin/ar/Makefile =================================================================== RCS file: /home/ncvs/src/usr.bin/ar/Makefile,v retrieving revision 1.19 diff -u -p -r1.19 Makefile --- usr.bin/ar/Makefile 22 Feb 2008 06:53:52 -0000 1.19 +++ usr.bin/ar/Makefile 22 Feb 2008 10:31:44 -0000 @@ -1,10 +1,21 @@ # $FreeBSD: src/usr.bin/ar/Makefile,v 1.19 2008/02/22 06:53:52 obrien Exp $ -.if defined(WITH_BSDAR) PROG= ar + +.if !defined(WITH_GNUAR) +NO_SHARED?= yes +LINKS= ${BINDIR}/ar ${BINDIR}/ranlib +MLINKS= ar.1 ranlib.1 .else -PROG= bsdar +PROGNAME= bsdar +MAN= bsdar.1 +bsdar.1: ar.1 + cat ${.ALLSRC} > ${.TARGET} +CLEANFILES+= bsdar.1 +LINKS= ${BINDIR}/bsdar ${BINDIR}/bsdranlib +MLINKS= bsdar.1 bsdranlib.1 .endif + SRCS= ar.c read.c util.c write.c WARNS?= 5 @@ -12,17 +23,4 @@ WARNS?= 5 DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBELF} LDADD= -larchive -lbz2 -lz -lelf -.if defined(WITH_BSDAR) -NO_SHARED?= yes -LINKS= ${BINDIR}/ar ${BINDIR}/ranlib -MLINKS= ar ranlib -.else -LINKS= ${BINDIR}/bsdar ${BINDIR}/bsdranlib -MLINKS= bsdar.1 bsdranlib.1 - -CLEANFILES+= bsdar.1 -bsdar.1: ar.1 - ln -sf ${.ALLSRC} ${.TARGET} -.endif - .include --W/nzBZO5zC0uMSeA--