summaryrefslogtreecommitdiffstats
path: root/gnu
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2008-02-25 16:16:17 +0000
committerru <ru@FreeBSD.org>2008-02-25 16:16:17 +0000
commit26039ac2176a7a1304d7fceb821d54f7ef66bc82 (patch)
tree28d6df447ce69fdf55af863e05d3236bf6853840 /gnu
parent16e1a3004adbb3fd5113d3ddcbef13217bbb60bd (diff)
downloadFreeBSD-src-26039ac2176a7a1304d7fceb821d54f7ef66bc82.zip
FreeBSD-src-26039ac2176a7a1304d7fceb821d54f7ef66bc82.tar.gz
Make again BSD ar(1) the default system ar(1), now properly handling
source upgrades by falling back to GNU ar(1) as necessary. Option WITH_BSDAR is gone. Option _WITH_GNUAR to aid in upgrades is *not* supposed to be set by the user. Stop bootstrapping BSD ar(1) on the next __FreeBSD_version bump, as there are no known bugs in it. Bump __FreeBSD_version to anticipate this and to flag the switch to BSD ar(1), should it be needed for something. Input from: obrien, des, kaiw
Diffstat (limited to 'gnu')
-rw-r--r--gnu/usr.bin/binutils/ar/Makefile13
-rw-r--r--gnu/usr.bin/binutils/ranlib/Makefile13
2 files changed, 16 insertions, 10 deletions
diff --git a/gnu/usr.bin/binutils/ar/Makefile b/gnu/usr.bin/binutils/ar/Makefile
index b740bec..32f340d 100644
--- a/gnu/usr.bin/binutils/ar/Makefile
+++ b/gnu/usr.bin/binutils/ar/Makefile
@@ -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
diff --git a/gnu/usr.bin/binutils/ranlib/Makefile b/gnu/usr.bin/binutils/ranlib/Makefile
index abcd350..792824b 100644
--- a/gnu/usr.bin/binutils/ranlib/Makefile
+++ b/gnu/usr.bin/binutils/ranlib/Makefile
@@ -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
OpenPOWER on IntegriCloud