kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove variable GNU_PROGRAM_PREFIX as discussed in pkgsrc-users@, always

Browse source 
use prefix 'g' instead, and add symlinks
with original names in gnu/bin and gnu/man.

++pkgrevision
This commit is contained in:
cheusov 2012-06-02 11:54:38 +00:00
parent 0469176bf0
commit 046ffb9517
3 changed files with 81 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
devel/binutils/Makefile
View file

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.41 2011/11/01 20:47:07 cheusov Exp $
# $NetBSD: Makefile,v 1.42 2012/06/02 11:54:38 cheusov Exp $
DISTNAME= binutils-2.17
PKGREVISION= 1
PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU:=binutils/}
@ -26,10 +26,7 @@ MAKEFLAGS+= TEXINFO_LOCALE=no
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-lib-path='/lib:/usr/lib'
CONFIGURE_ARGS+= --disable-werror # pkg/45541
GNU_PROGRAM_PREFIX?= gnu-
CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX:Q}
PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q}
BUILD_DEFS+= GNU_PROGRAM_PREFIX
CONFIGURE_ARGS+= --program-prefix=g
BINUTILS_PREFIX= ${PREFIX}/${MACHINE_GNU_PLATFORM}
PLIST_SRC= ${PKGDIR}/PLIST.common
@ -37,6 +34,8 @@ PLIST_SRC+= ${WRKDIR}/PLIST_DYNAMIC
INFO_FILES= yes
INSTALLATION_DIRS= gnu/bin gnu/man/man1
# gprof (XXX: and others?) cannot be built on all platforms
#
PLIST_VARS+= gprof
@ -56,6 +55,7 @@ CFLAGS+= -Wno-unused-value -Wno-format-security \
#
post-configure:
.for f in ld/ldver.texi ld/ld.1 gas/doc/gasver.texi gas/doc/as.1
set -e; \
if [ -f ${WRKSRC}/${f} ]; then \
touch ${WRKSRC}/${f}; \
fi
@ -65,5 +65,15 @@ post-install:
cd ${DESTDIR}${PREFIX} && find ${MACHINE_GNU_PLATFORM}/lib/ldscripts -type f -print \
| sort -r \
> ${WRKDIR}/PLIST_DYNAMIC
.for f in addr2line ar as c++filt dlltool gprof ld nlmconv nm objcopy objdump ranlib \
readelf size strings strip windres
set -e; \
if ${TEST} -f ${DESTDIR}${PREFIX}/bin/g${f:Q}; then \
${LN} -sf ${PREFIX}/bin/g${f} ${DESTDIR}${PREFIX}/gnu/bin/${f}; \
fi
if ${TEST} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/g${f:Q}.1; then \
${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/g${f}.1 ${DESTDIR}${PREFIX}/gnu/man/man1/${f}.1; \
fi
.endfor
.include "../../mk/bsd.pkg.mk"

95
devel/binutils/PLIST.common
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST.common,v 1.15 2008/04/12 22:42:59 jlam Exp $
@comment $NetBSD: PLIST.common,v 1.16 2012/06/02 11:54:38 cheusov Exp $
${MACHINE_GNU_PLATFORM}/bin/ar
${MACHINE_GNU_PLATFORM}/bin/as
${MACHINE_GNU_PLATFORM}/bin/ld
@ -6,20 +6,51 @@ ${MACHINE_GNU_PLATFORM}/bin/nm
${MACHINE_GNU_PLATFORM}/bin/objdump
${MACHINE_GNU_PLATFORM}/bin/ranlib
${MACHINE_GNU_PLATFORM}/bin/strip
bin/${GNU_PROGRAM_PREFIX}addr2line
bin/${GNU_PROGRAM_PREFIX}ar
bin/${GNU_PROGRAM_PREFIX}as
bin/${GNU_PROGRAM_PREFIX}c++filt
${PLIST.gprof}bin/${GNU_PROGRAM_PREFIX}gprof
bin/${GNU_PROGRAM_PREFIX}ld
bin/${GNU_PROGRAM_PREFIX}nm
bin/${GNU_PROGRAM_PREFIX}objcopy
bin/${GNU_PROGRAM_PREFIX}objdump
bin/${GNU_PROGRAM_PREFIX}ranlib
bin/${GNU_PROGRAM_PREFIX}readelf
bin/${GNU_PROGRAM_PREFIX}size
bin/${GNU_PROGRAM_PREFIX}strings
bin/${GNU_PROGRAM_PREFIX}strip
bin/gaddr2line
bin/gar
bin/gas
bin/gc++filt
${PLIST.gprof}bin/ggprof
bin/gld
bin/gnm
bin/gobjcopy
bin/gobjdump
bin/granlib
bin/greadelf
bin/gsize
bin/gstrings
bin/gstrip
gnu/bin/addr2line
gnu/bin/ar
gnu/bin/as
gnu/bin/c++filt
${PLIST.gprof}gnu/bin/gprof
gnu/bin/ld
gnu/bin/nm
gnu/bin/objcopy
gnu/bin/objdump
gnu/bin/ranlib
gnu/bin/readelf
gnu/bin/size
gnu/bin/strings
gnu/bin/strip
gnu/man/man1/addr2line.1
gnu/man/man1/ar.1
gnu/man/man1/as.1
gnu/man/man1/c++filt.1
gnu/man/man1/dlltool.1
${PLIST.gprof}gnu/man/man1/gprof.1
gnu/man/man1/ld.1
gnu/man/man1/nlmconv.1
gnu/man/man1/nm.1
gnu/man/man1/objcopy.1
gnu/man/man1/objdump.1
gnu/man/man1/ranlib.1
gnu/man/man1/readelf.1
gnu/man/man1/size.1
gnu/man/man1/strings.1
gnu/man/man1/strip.1
gnu/man/man1/windres.1
include/ansidecl.h
include/bfd.h
include/bfdlink.h
@ -33,23 +64,23 @@ info/ld.info
lib/libbfd.la
lib/libiberty.a
lib/libopcodes.la
man/man1/${GNU_PROGRAM_PREFIX}addr2line.1
man/man1/${GNU_PROGRAM_PREFIX}ar.1
man/man1/${GNU_PROGRAM_PREFIX}as.1
man/man1/${GNU_PROGRAM_PREFIX}c++filt.1
man/man1/${GNU_PROGRAM_PREFIX}dlltool.1
${PLIST.gprof}man/man1/${GNU_PROGRAM_PREFIX}gprof.1
man/man1/${GNU_PROGRAM_PREFIX}ld.1
man/man1/${GNU_PROGRAM_PREFIX}nlmconv.1
man/man1/${GNU_PROGRAM_PREFIX}nm.1
man/man1/${GNU_PROGRAM_PREFIX}objcopy.1
man/man1/${GNU_PROGRAM_PREFIX}objdump.1
man/man1/${GNU_PROGRAM_PREFIX}ranlib.1
man/man1/${GNU_PROGRAM_PREFIX}readelf.1
man/man1/${GNU_PROGRAM_PREFIX}size.1
man/man1/${GNU_PROGRAM_PREFIX}strings.1
man/man1/${GNU_PROGRAM_PREFIX}strip.1
man/man1/${GNU_PROGRAM_PREFIX}windres.1
man/man1/gaddr2line.1
man/man1/gar.1
man/man1/gas.1
man/man1/gc++filt.1
man/man1/gdlltool.1
${PLIST.gprof}man/man1/ggprof.1
man/man1/gld.1
man/man1/gnlmconv.1
man/man1/gnm.1
man/man1/gobjcopy.1
man/man1/gobjdump.1
man/man1/granlib.1
man/man1/greadelf.1
man/man1/gsize.1
man/man1/gstrings.1
man/man1/gstrip.1
man/man1/gwindres.1
share/locale/da/LC_MESSAGES/bfd.mo
share/locale/da/LC_MESSAGES/binutils.mo
${PLIST.gprof}share/locale/da/LC_MESSAGES/gprof.mo

8
devel/binutils/override-as.mk
View file

@ -1,14 +1,10 @@
# $NetBSD: override-as.mk,v 1.2 2009/06/13 06:46:41 rillig Exp $
# $NetBSD: override-as.mk,v 1.3 2012/06/02 11:54:38 cheusov Exp $
# This Makefile fragment can be included by packages that wish to
# override the default selection of as(1) and use the one from devel/binutils
# instead.
GNU_PREFIX_CMD= ${PKG_INFO} -Q GNU_PROGRAM_PREFIX binutils 2>/dev/null \
|| { cd ${BUILDLINK_PKGSRCDIR.binutils} \
&& ${MAKE} ${MAKEFLAGS} show-var VARNAME=GNU_PROGRAM_PREFIX; }
PKG_AS= ${PREFIX}/bin/${:!${GNU_PREFIX_CMD}!}as
PKG_AS= ${PREFIX}/bin/gnu/as
.include "../../mk/compiler.mk"