diff options
| author | kaiw <kaiw@FreeBSD.org> | 2008-02-21 11:21:29 +0000 |
|---|---|---|
| committer | kaiw <kaiw@FreeBSD.org> | 2008-02-21 11:21:29 +0000 |
| commit | e949f3109eba639587f7f1e67c0d263489d31639 (patch) | |
| tree | 8d996a1dde68286e76a4c2b31b05b36c28572fb4 /gnu/usr.bin | |
| parent | d078b9f274d4a84e9f9b313ffa1e7c2b80833daf (diff) | |
| download | FreeBSD-src-e949f3109eba639587f7f1e67c0d263489d31639.zip FreeBSD-src-e949f3109eba639587f7f1e67c0d263489d31639.tar.gz | |
* Connect ar(1) to the build and make it default ar. Rename GNU
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)
Diffstat (limited to 'gnu/usr.bin')
| -rw-r--r-- | gnu/usr.bin/binutils/ar/Makefile | 5 | ||||
| -rw-r--r-- | gnu/usr.bin/binutils/ranlib/Makefile | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/gnu/usr.bin/binutils/ar/Makefile b/gnu/usr.bin/binutils/ar/Makefile index 5903186..090a16f 100644 --- a/gnu/usr.bin/binutils/ar/Makefile +++ b/gnu/usr.bin/binutils/ar/Makefile @@ -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 diff --git a/gnu/usr.bin/binutils/ranlib/Makefile b/gnu/usr.bin/binutils/ranlib/Makefile index 8edfa01..68d230d 100644 --- a/gnu/usr.bin/binutils/ranlib/Makefile +++ b/gnu/usr.bin/binutils/ranlib/Makefile @@ -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 |
