d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Connect ar(1) to the build and make it default ar. Rename GNU

Browse Source 
binutils ar and ranlib to gar and granlib, respectively.

* Introduce a temporary variable WITH_GNUAR as a safety net.
When buildworld with -DWITH_GNUAR, GNU binutils ar and ranlib
will install as default ones and 'BSD' ar will be disabled.

* Bump __FreeBSD_version to reflect the import of 'BSD' ar(1).

Approved by:		 jkoshy (mentor)
This commit is contained in:
kaiw 2008-02-21 11:21:29 +00:00
parent d078b9f274
commit e949f3109e
4 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gnu/usr.bin/binutils/ar/Makefile
View File

@ -4,7 +4,12 @@
.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

5
gnu/usr.bin/binutils/ranlib/Makefile
View File

@ -4,7 +4,12 @@
.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

2
sys/sys/param.h
View File

@ -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>

4
usr.bin/Makefile
View File

@ -232,6 +232,10 @@ SUBDIR= alias \
${_ypmatch} \
${_ypwhich}
.if !defined(WITH_GNUAR)
SUBDIR+= ar
.endif
.if ${MACHINE_ARCH} != "arm"
_truss= truss
.endif