From f9499adf5b4656abe97f9d3e5f4d6ee9043aba08 Mon Sep 17 00:00:00 2001 From: kaiw Date: Thu, 21 Feb 2008 16:12:46 +0000 Subject: Back out previous commit. Restore Binutils ar as default. Disconnect 'BSD' ar to the build. Requested by: des --- gnu/usr.bin/binutils/ar/Makefile | 5 ----- gnu/usr.bin/binutils/ranlib/Makefile | 5 ----- sys/sys/param.h | 2 +- usr.bin/Makefile | 4 ---- 4 files changed, 1 insertion(+), 15 deletions(-) diff --git a/gnu/usr.bin/binutils/ar/Makefile b/gnu/usr.bin/binutils/ar/Makefile index 090a16f..5903186 100644 --- a/gnu/usr.bin/binutils/ar/Makefile +++ b/gnu/usr.bin/binutils/ar/Makefile @@ -4,12 +4,7 @@ .PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc -.if defined(WITH_GNUAR) PROG= ar -.else -PROG= gar -MAN= ar.1 -.endif 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 68d230d..8edfa01 100644 --- a/gnu/usr.bin/binutils/ranlib/Makefile +++ b/gnu/usr.bin/binutils/ranlib/Makefile @@ -4,12 +4,7 @@ .PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc -.if defined(WITH_GNUAR) PROG= ranlib -.else -PROG= granlib -MAN= ranlib.1 -.endif SRCS= ar.c is-ranlib.c CFLAGS+= -D_GNU_SOURCE CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils diff --git a/sys/sys/param.h b/sys/sys/param.h index a9d3a59..9b63799 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -57,7 +57,7 @@ * is created, otherwise 1. */ #undef __FreeBSD_version -#define __FreeBSD_version 800022 /* Master, propagated to newvers */ +#define __FreeBSD_version 800021 /* Master, propagated to newvers */ #ifndef LOCORE #include diff --git a/usr.bin/Makefile b/usr.bin/Makefile index f954a1e..39ea150 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -232,10 +232,6 @@ SUBDIR= alias \ ${_ypmatch} \ ${_ypwhich} -.if !defined(WITH_GNUAR) -SUBDIR+= ar -.endif - .if ${MACHINE_ARCH} != "arm" _truss= truss .endif -- cgit v1.1