[HEADS UP] ar(1) front-end committed. (notes for cross compile)

David O'Brien obrien at FreeBSD.org
Sun Feb 24 18:04:37 UTC 2008


On Sat, Feb 23, 2008 at 11:18:08PM +0300, Ruslan Ermilov wrote:
> now bootstrap BSD ar on systems >700044, and that we call
> GNU ar/ranlib with the "g" prefix instead of "gnu-".

Why are you going against my preferences for "gnu-" - if I liked "g"
I would have done it that way in my patch.


Its seems those that have expressed an opinion want to switch to the new
'ar' ASAP.  So why not this patch?

(BTW, what is the sort order in Makefile.inc1?  BOOTSTRAPPING date and
alphabetical?)


Index: Makefile.inc1
===================================================================
RCS file: /home/ncvs/src/Makefile.inc1,v
retrieving revision 1.593
diff -u -p -r1.593 Makefile.inc1
--- Makefile.inc1	21 Jan 2008 18:44:54 -0000	1.593
+++ Makefile.inc1	24 Feb 2008 18:03:35 -0000
@@ -876,8 +876,13 @@ _gensnmptree=	usr.sbin/bsnmpd/gensnmptre
 _crunchgen=	usr.sbin/crunch/crunchgen
 .endif
 
+.if ${BOOTSTRAPPING} >= 700044
+_ar=     usr.bin/ar
+.endif
+
 bootstrap-tools:
 .for _tool in \
+    ${_ar} \
     ${_strfile} \
     ${_gperf} \
     ${_groff} \
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	24 Feb 2008 17:53:29 -0000
@@ -1,10 +1,6 @@
 # $FreeBSD: src/usr.bin/ar/Makefile,v 1.19 2008/02/22 06:53:52 obrien Exp $
 
-.if defined(WITH_BSDAR)
 PROG=	ar
-.else
-PROG=	bsdar
-.endif
 SRCS=	ar.c read.c util.c write.c
 
 WARNS?=	5
@@ -12,17 +8,8 @@ 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
+MLINKS=	ar.1 ranlib.1
 
 .include <bsd.prog.mk>
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	24 Feb 2008 17:55:19 -0000
@@ -4,12 +4,7 @@
 
 .PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc
 
-.if defined(WITH_BSDAR)
 PROG=	gnu-ar
-#MAN=	gnu-ar.1
-.else
-PROG=	ar
-.endif
 SRCS=	ar.c not-ranlib.c
 CFLAGS+= -D_GNU_SOURCE
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
@@ -21,4 +16,8 @@ DPADD+=	${RELTOP}/libbfd/libbfd.a
 DPADD+=	${RELTOP}/libiberty/libiberty.a
 LDADD=	${DPADD}
 
+CLEANFILES+= gnu-ar.1
+gnu-ar.1: ar.1
+	ln -sf ${.ALLSRC} ${.TARGET}
+
 .include <bsd.prog.mk>
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	24 Feb 2008 17:56:21 -0000
@@ -4,12 +4,7 @@
 
 .PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc
 
-.if defined(WITH_BSDAR)
 PROG=	gnu-ranlib
-#MAN=	gnu-ranlib.1
-.else
-PROG=	ranlib
-.endif
 SRCS=	ar.c is-ranlib.c
 CFLAGS+= -D_GNU_SOURCE
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
@@ -21,4 +16,8 @@ DPADD+=	${RELTOP}/libbfd/libbfd.a
 DPADD+=	${RELTOP}/libiberty/libiberty.a
 LDADD=	${DPADD}
 
+CLEANFILES+= gnu-ranlib.1
+gnu-ranlib.1: ar.1
+	ln -sf ${.ALLSRC} ${.TARGET}
+
 .include <bsd.prog.mk>


More information about the freebsd-current mailing list