Move remaining users of USE_CROSSBASE to just install into ${PREFIX}/cross.

To simplify infrastructure.

Ok joerg@

XXX: nios2-gcc3 loops endlessly during build, before and after change,
so untested.
XXX: nios2-gcc does not build on -current, in the same way before
and after the change, so untested.

3 files changed, 65 insertions, 67 deletions

diff --git a/cross/nios2-binutils/Makefile b/cross/nios2-binutils/Makefile
index 9a5dd01d7f8..019fd70eb32 100644
--- a/cross/nios2-binutils/Makefile
+++ b/cross/nios2-binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2014/11/10 03:34:53 mef Exp $
+# $NetBSD: Makefile,v 1.14 2016/06/19 16:20:28 wiz Exp $
 
 DISTNAME=		binutils-2.24
 PKGNAME=		${DISTNAME:S/^/nios2-/}
@@ -17,7 +17,6 @@ USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
-USE_PKGLOCALEDIR=	yes
 USE_GNU_CONFIGURE_HOST=	no
 INFO_FILES=		# empty
 
@@ -36,14 +35,13 @@ NIOS2_TARGET=		nios2-elf
 CONFIGURE_ARGS+=	--disable-werror --target=${NIOS2_TARGET} --disable-nls
 PLIST_SUBST+=		NIOS2_TARGET=${NIOS2_TARGET:Q}
 
-USE_CROSSBASE=		yes
-BUILD_DEFS+=		CROSSBASE
-PATH:=			${CROSSBASE}/bin:${PATH}
+GNU_CONFIGURE_PREFIX=	${PREFIX}/cross
+PATH:=			${PREFIX}/cross/bin:${PATH}
 AUTO_MKDIRS=		yes
 
 # following file installed is reference only, not used at all for the moment
 post-install:
-	${INSTALL_DATA} files/nios2elf-netbsd.x ${DESTDIR}${PREFIX}/${NIOS2_TARGET}/lib/ldscripts
+	${INSTALL_DATA} files/nios2elf-netbsd.x ${DESTDIR}${PREFIX}/cross/${NIOS2_TARGET}/lib/ldscripts
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cross/nios2-binutils/PLIST b/cross/nios2-binutils/PLIST
index 89ea1ac079e..be0f39744f9 100644
--- a/cross/nios2-binutils/PLIST
+++ b/cross/nios2-binutils/PLIST
@@ -1,59 +1,59 @@
-@comment $NetBSD: PLIST,v 1.4 2014/06/15 23:43:13 mef Exp $
-${NIOS2_TARGET}/bin/ar
-${NIOS2_TARGET}/bin/as
-${NIOS2_TARGET}/bin/ld
-${NIOS2_TARGET}/bin/ld.bfd
-${NIOS2_TARGET}/bin/nm
-${NIOS2_TARGET}/bin/objcopy
-${NIOS2_TARGET}/bin/objdump
-${NIOS2_TARGET}/bin/ranlib
-${NIOS2_TARGET}/bin/strip
-bin/${NIOS2_TARGET}-addr2line
-bin/${NIOS2_TARGET}-ar
-bin/${NIOS2_TARGET}-as
-bin/${NIOS2_TARGET}-c++filt
-bin/${NIOS2_TARGET}-elfedit
-bin/${NIOS2_TARGET}-gprof
-bin/${NIOS2_TARGET}-ld
-bin/${NIOS2_TARGET}-ld.bfd
-bin/${NIOS2_TARGET}-nm
-bin/${NIOS2_TARGET}-objcopy
-bin/${NIOS2_TARGET}-objdump
-bin/${NIOS2_TARGET}-ranlib
-bin/${NIOS2_TARGET}-readelf
-bin/${NIOS2_TARGET}-size
-bin/${NIOS2_TARGET}-strings
-bin/${NIOS2_TARGET}-strip
-${NIOS2_TARGET}/lib/ldscripts/nios2elf-netbsd.x
-${NIOS2_TARGET}/lib/ldscripts/nios2elf.x
-${NIOS2_TARGET}/lib/ldscripts/nios2elf.xbn
-${NIOS2_TARGET}/lib/ldscripts/nios2elf.xc
-${NIOS2_TARGET}/lib/ldscripts/nios2elf.xd
-${NIOS2_TARGET}/lib/ldscripts/nios2elf.xdc
-${NIOS2_TARGET}/lib/ldscripts/nios2elf.xdw
-${NIOS2_TARGET}/lib/ldscripts/nios2elf.xn
-${NIOS2_TARGET}/lib/ldscripts/nios2elf.xr
-${NIOS2_TARGET}/lib/ldscripts/nios2elf.xs
-${NIOS2_TARGET}/lib/ldscripts/nios2elf.xsc
-${NIOS2_TARGET}/lib/ldscripts/nios2elf.xsw
-${NIOS2_TARGET}/lib/ldscripts/nios2elf.xu
-${NIOS2_TARGET}/lib/ldscripts/nios2elf.xw
-man/man1/${NIOS2_TARGET}-addr2line.1
-man/man1/${NIOS2_TARGET}-ar.1
-man/man1/${NIOS2_TARGET}-as.1
-man/man1/${NIOS2_TARGET}-c++filt.1
-man/man1/${NIOS2_TARGET}-dlltool.1
-man/man1/${NIOS2_TARGET}-elfedit.1
-man/man1/${NIOS2_TARGET}-gprof.1
-man/man1/${NIOS2_TARGET}-ld.1
-man/man1/${NIOS2_TARGET}-nlmconv.1
-man/man1/${NIOS2_TARGET}-nm.1
-man/man1/${NIOS2_TARGET}-objcopy.1
-man/man1/${NIOS2_TARGET}-objdump.1
-man/man1/${NIOS2_TARGET}-ranlib.1
-man/man1/${NIOS2_TARGET}-readelf.1
-man/man1/${NIOS2_TARGET}-size.1
-man/man1/${NIOS2_TARGET}-strings.1
-man/man1/${NIOS2_TARGET}-strip.1
-man/man1/${NIOS2_TARGET}-windmc.1
-man/man1/${NIOS2_TARGET}-windres.1
+@comment $NetBSD: PLIST,v 1.5 2016/06/19 16:20:28 wiz Exp $
+cross/${NIOS2_TARGET}/bin/ar
+cross/${NIOS2_TARGET}/bin/as
+cross/${NIOS2_TARGET}/bin/ld
+cross/${NIOS2_TARGET}/bin/ld.bfd
+cross/${NIOS2_TARGET}/bin/nm
+cross/${NIOS2_TARGET}/bin/objcopy
+cross/${NIOS2_TARGET}/bin/objdump
+cross/${NIOS2_TARGET}/bin/ranlib
+cross/${NIOS2_TARGET}/bin/strip
+cross/bin/${NIOS2_TARGET}-addr2line
+cross/bin/${NIOS2_TARGET}-ar
+cross/bin/${NIOS2_TARGET}-as
+cross/bin/${NIOS2_TARGET}-c++filt
+cross/bin/${NIOS2_TARGET}-elfedit
+cross/bin/${NIOS2_TARGET}-gprof
+cross/bin/${NIOS2_TARGET}-ld
+cross/bin/${NIOS2_TARGET}-ld.bfd
+cross/bin/${NIOS2_TARGET}-nm
+cross/bin/${NIOS2_TARGET}-objcopy
+cross/bin/${NIOS2_TARGET}-objdump
+cross/bin/${NIOS2_TARGET}-ranlib
+cross/bin/${NIOS2_TARGET}-readelf
+cross/bin/${NIOS2_TARGET}-size
+cross/bin/${NIOS2_TARGET}-strings
+cross/bin/${NIOS2_TARGET}-strip
+cross/${NIOS2_TARGET}/lib/ldscripts/nios2elf-netbsd.x
+cross/${NIOS2_TARGET}/lib/ldscripts/nios2elf.x
+cross/${NIOS2_TARGET}/lib/ldscripts/nios2elf.xbn
+cross/${NIOS2_TARGET}/lib/ldscripts/nios2elf.xc
+cross/${NIOS2_TARGET}/lib/ldscripts/nios2elf.xd
+cross/${NIOS2_TARGET}/lib/ldscripts/nios2elf.xdc
+cross/${NIOS2_TARGET}/lib/ldscripts/nios2elf.xdw
+cross/${NIOS2_TARGET}/lib/ldscripts/nios2elf.xn
+cross/${NIOS2_TARGET}/lib/ldscripts/nios2elf.xr
+cross/${NIOS2_TARGET}/lib/ldscripts/nios2elf.xs
+cross/${NIOS2_TARGET}/lib/ldscripts/nios2elf.xsc
+cross/${NIOS2_TARGET}/lib/ldscripts/nios2elf.xsw
+cross/${NIOS2_TARGET}/lib/ldscripts/nios2elf.xu
+cross/${NIOS2_TARGET}/lib/ldscripts/nios2elf.xw
+cross/man/man1/${NIOS2_TARGET}-addr2line.1
+cross/man/man1/${NIOS2_TARGET}-ar.1
+cross/man/man1/${NIOS2_TARGET}-as.1
+cross/man/man1/${NIOS2_TARGET}-c++filt.1
+cross/man/man1/${NIOS2_TARGET}-dlltool.1
+cross/man/man1/${NIOS2_TARGET}-elfedit.1
+cross/man/man1/${NIOS2_TARGET}-gprof.1
+cross/man/man1/${NIOS2_TARGET}-ld.1
+cross/man/man1/${NIOS2_TARGET}-nlmconv.1
+cross/man/man1/${NIOS2_TARGET}-nm.1
+cross/man/man1/${NIOS2_TARGET}-objcopy.1
+cross/man/man1/${NIOS2_TARGET}-objdump.1
+cross/man/man1/${NIOS2_TARGET}-ranlib.1
+cross/man/man1/${NIOS2_TARGET}-readelf.1
+cross/man/man1/${NIOS2_TARGET}-size.1
+cross/man/man1/${NIOS2_TARGET}-strings.1
+cross/man/man1/${NIOS2_TARGET}-strip.1
+cross/man/man1/${NIOS2_TARGET}-windmc.1
+cross/man/man1/${NIOS2_TARGET}-windres.1
diff --git a/cross/nios2-binutils/buildlink3.mk b/cross/nios2-binutils/buildlink3.mk
index 951bff10a0a..ad32edcd023 100644
--- a/cross/nios2-binutils/buildlink3.mk
+++ b/cross/nios2-binutils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2013/12/06 01:08:27 mef Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2016/06/19 16:20:28 wiz Exp $
 
 BUILDLINK_TREE+=	nios2-binutils
 
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.nios2-binutils+=		nios2-binutils>=2.20
 BUILDLINK_PKGSRCDIR.nios2-binutils?=		../../cross/nios2-binutils
 BUILDLINK_FNAME_TRANSFORM.nios2-binutils+=	-e "s,${NIOS2_TARGET}/lib,lib/,g"
 #BUILDLINK_CONTENTS_FILTER.nios2-binutils=	${EGREP} '.*'
-BUILDLINK_CONTENTS_FILTER.nios2-binutils=	${GREP} '${CROSSBASE}'
+BUILDLINK_CONTENTS_FILTER.nios2-binutils=	${GREP} '${PREFIX}/cross'
 
 .endif # NIOS2_BINUTILS_BUILDLINK3_MK