diff options
| author | wiz <wiz> | 2016-06-19 16:20:27 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2016-06-19 16:20:27 +0000 |
| commit | 1d34107d0a01b4cc91c3d353786124b63bfd328e (patch) | |
| tree | 01ba272d9a2bb0fea62601f35282981211e965d0 /cross/nios2-gcc3 | |
| parent | 26b010eba81a0304f48c42c09eafc108c6620e61 (diff) | |
| download | pkgsrc-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/nios2-gcc3')
| -rw-r--r-- | cross/nios2-gcc3/Makefile | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/cross/nios2-gcc3/Makefile b/cross/nios2-gcc3/Makefile index 19abfffb41e..fae14032c3c 100644 --- a/cross/nios2-gcc3/Makefile +++ b/cross/nios2-gcc3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2015/06/12 10:48:35 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2016/06/19 16:20:28 wiz Exp $ PKG_VERSION= 3.4.6 # PKGNAME will have option name only when explictly selected @@ -17,23 +17,19 @@ NOT_FOR_BULK_PLATFORM= SunOS-*-* EXTRACT_ELEMENTS= gcc WRKSRC= ${WRKDIR}/gcc -#PATH:= ${CROSSBASE}/bin:${PATH} USE_TOOLS+= gmake makeinfo perl USE_GNU_CONFIGURE_HOST= no -#BUILD_DEFS+= CROSSBASE #included in ../nios2/Makefile.common DEPENDS+= nios2-binutils-[0-9]*:../../cross/nios2-binutils GNU_CONFIGURE= yes -USE_PKGLOCALEDIR= yes NIOS2_TARGET?= nios2-elf 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} BUILD_DEPENDS+= gtexinfo-[0-9]*:../../devel/gtexinfo @@ -57,15 +53,15 @@ INFO_FILES= no # to avoid conflict with binutils (to be fixed by more sophisticated way) post-install: - ${RM} ${DESTDIR}${CROSSBASE}/lib/libiberty.a + ${RM} ${DESTDIR}${PREFIX}/cross/lib/libiberty.a # to avoid conflict wit mingw-w64-gcc-4.5.1 - ${RM} ${DESTDIR}${CROSSBASE}/man/man7/fsf-funding.7 - ${RM} ${DESTDIR}${CROSSBASE}/man/man7/gfdl.7 - ${RM} ${DESTDIR}${CROSSBASE}/man/man7/gpl.7 - ${RM} ${DESTDIR}${CROSSBASE}/info/cpp.info - ${RM} ${DESTDIR}${CROSSBASE}/info/cppinternals.info - ${RM} ${DESTDIR}${CROSSBASE}/info/gcc.info - ${RM} ${DESTDIR}${CROSSBASE}/info/gccinstall.info - ${RM} ${DESTDIR}${CROSSBASE}/info/gccint.info + ${RM} ${DESTDIR}${PREFIX}/cross/man/man7/fsf-funding.7 + ${RM} ${DESTDIR}${PREFIX}/cross/man/man7/gfdl.7 + ${RM} ${DESTDIR}${PREFIX}/cross/man/man7/gpl.7 + ${RM} ${DESTDIR}${PREFIX}/cross/info/cpp.info + ${RM} ${DESTDIR}${PREFIX}/cross/info/cppinternals.info + ${RM} ${DESTDIR}${PREFIX}/cross/info/gcc.info + ${RM} ${DESTDIR}${PREFIX}/cross/info/gccinstall.info + ${RM} ${DESTDIR}${PREFIX}/cross/info/gccint.info .include "../../mk/bsd.pkg.mk" |