summaryrefslogtreecommitdiff
path: root/cross/bfd-mdsetimage
diff options
context:
space:
mode:
authorwiz <wiz>2016-06-19 16:20:27 +0000
committerwiz <wiz>2016-06-19 16:20:27 +0000
commit1d34107d0a01b4cc91c3d353786124b63bfd328e (patch)
tree01ba272d9a2bb0fea62601f35282981211e965d0 /cross/bfd-mdsetimage
parent26b010eba81a0304f48c42c09eafc108c6620e61 (diff)
downloadpkgsrc-1d34107d0a01b4cc91c3d353786124b63bfd328e.tar.gz
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.
Diffstat (limited to 'cross/bfd-mdsetimage')
-rw-r--r--cross/bfd-mdsetimage/Makefile13
-rw-r--r--cross/bfd-mdsetimage/PLIST4
2 files changed, 9 insertions, 8 deletions
diff --git a/cross/bfd-mdsetimage/Makefile b/cross/bfd-mdsetimage/Makefile
index f5ae7f15f27..f244ac76b21 100644
--- a/cross/bfd-mdsetimage/Makefile
+++ b/cross/bfd-mdsetimage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2015/12/26 23:09:45 dholland Exp $
+# $NetBSD: Makefile,v 1.26 2016/06/19 16:20:27 wiz Exp $
DISTNAME= bfd-mdsetimage-1.15.1
PKGREVISION= 1
@@ -10,19 +10,20 @@ MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Mdsetimage using libbfd, used for cross-building distributions
LICENSE= modified-bsd
-INSTALLATION_DIRS= bin
+INSTALLATION_DIRS= cross/bin
WRKSRC= ${WRKDIR}
NO_CONFIGURE= yes
-USE_CROSSBASE= yes
BFD_VERSION= 2.9.1
-CPPFLAGS+= -I${PREFIX}/include
+CPPFLAGS+= -I${PREFIX}/cross/include
MAKE_ENV+= BFD_VERSION=${BFD_VERSION:Q} \
LIBS=${BFD_LIBS:Q}
+MAKE_FLAGS+= PREFIX=${PREFIX}/cross
+MAKE_FLAGS+= BINDIR=${PREFIX}/cross/bin
FIX_RPATH+= BFD_LIBS
-BFD_LIBS= -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -lbfd -liberty -lintl
+BFD_LIBS= -L${PREFIX}/cross/lib ${COMPILER_RPATH_FLAG}${PREFIX}/cross/lib -lbfd -liberty -lintl
USE_BSD_MAKEFILE= yes
@@ -31,5 +32,5 @@ do-extract:
@${CP} ${FILESDIR}/Makefile ${FILESDIR}/mdsetimage.8 ${FILESDIR}/mdsetimage.c \
${WRKSRC}
-.include "../../cross/binutils/buildlink3.mk"
+.include "../../cross/cross-binutils/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/cross/bfd-mdsetimage/PLIST b/cross/bfd-mdsetimage/PLIST
index 21db6d708ea..7315a6a3446 100644
--- a/cross/bfd-mdsetimage/PLIST
+++ b/cross/bfd-mdsetimage/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:03:25 zuntum Exp $
-bin/mdsetimage
+@comment $NetBSD: PLIST,v 1.2 2016/06/19 16:20:27 wiz Exp $
+cross/bin/mdsetimage