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

[Ruslan Ermilov]

On Fri, Feb 22, 2008 at 01:59:32PM +0100, Dag-Erling Sm??rgrav wrote:
> Ruslan Ermilov <ru at freebsd.org> writes:
> > Dag-Erling Sm??rgrav <des at des.no> writes:
> > > __FreeBSD_version wasn't bumped specifically for it, but 700044
> > > should be fine.
> > And for 8xxxxx?
> 
> 700044 is from before the branch, so anything > 700044 is fine.
> 
OK, I'm going to commit the attached patch in 12 hours,
unless I hear some objections.  It differs in that we
now bootstrap BSD ar on systems >700044, and that we call
GNU ar/ranlib with the "g" prefix instead of "gnu-".


Cheers,
-- 
Ruslan Ermilov
ru at FreeBSD.org
FreeBSD committer
-------------- next part --------------
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 <sys/types.h>
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	23 Feb 2008 20:16:41 -0000
@@ -872,6 +872,11 @@ _groff=		gnu/usr.bin/groff/tmac
 .endif
 .endif
 
+.if !defined(WITH_GNUAR) && \
+    ${BOOTSTRAPPING} >= 700044
+_ar=		usr.bin/ar
+.endif
+
 .if ${BOOTSTRAPPING} < 700018
 _gensnmptree=	usr.sbin/bsnmpd/gensnmptree
 .endif
@@ -891,6 +896,7 @@ bootstrap-tools:
     ${_strfile} \
     ${_gperf} \
     ${_groff} \
+    ${_ar} \
     usr.bin/lorder \
     usr.bin/makewhatis \
     usr.bin/rpcgen \
@@ -967,6 +973,10 @@ _kgzip=		usr.sbin/kgzip
 .endif
 .endif
 
+.if make(cross-tools) && ${BOOTSTRAPPING} < 700044
+.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	23 Feb 2008 19:48:58 -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= gar
+MAN=   gar.1
+gar.1: ar.1
+	cat ${.ALLSRC} > ${.TARGET}
+CLEANFILES+= gar.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	23 Feb 2008 19:49:14 -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= granlib
+MAN=	granlib.1
+granlib.1: ranlib.1
+	cat ${.ALLSRC} > ${.TARGET}
+CLEANFILES+= granlib.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 <bsd.prog.mk>