pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/cross Move remaining users of USE_CROSSBASE to just in...
details: https://anonhg.NetBSD.org/pkgsrc/rev/5d2203bb2ca6
branches: trunk
changeset: 348833:5d2203bb2ca6
user: wiz <wiz%pkgsrc.org@localhost>
date: Sun Jun 19 16:20:27 2016 +0000
description:
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:
cross/Makefile | 6 +-
cross/bfd-crunchide/Makefile | 13 +-
cross/bfd-crunchide/PLIST | 4 +-
cross/bfd-mdsetimage/Makefile | 13 +-
cross/bfd-mdsetimage/PLIST | 4 +-
cross/mingw-binutils/Makefile | 10 +-
cross/mingw-binutils/PLIST | 250 +++---
cross/mingw-gcc/Makefile | 20 +-
cross/mingw-gcc/PLIST | 630 +++++++++---------
cross/mingw-runtime-bin/Makefile | 5 +-
cross/mingw-runtime-bin/PLIST | 182 ++--
cross/mingw-w32api-bin/Makefile | 5 +-
cross/mingw-w32api-bin/PLIST | 918 +++++++++++++-------------
cross/mingw/Makefile | 3 +-
cross/mingw/Makefile.common | 8 +-
cross/nios2-binutils/Makefile | 10 +-
cross/nios2-binutils/PLIST | 118 +-
cross/nios2-binutils/buildlink3.mk | 4 +-
cross/nios2-gcc/Makefile | 21 +-
cross/nios2-gcc/PLIST | 375 +++++-----
cross/nios2-gcc3/Makefile | 28 +-
cross/nios2-gcc41/Makefile | 27 +-
cross/nios2-gcc41/PLIST | 1229 +++++++++++++++++------------------
cross/nios2/Makefile.common | 10 +-
24 files changed, 1937 insertions(+), 1956 deletions(-)
diffs (truncated from 4255 to 300 lines):
diff -r 985c805f016f -r 5d2203bb2ca6 cross/Makefile
--- a/cross/Makefile Sun Jun 19 16:19:04 2016 +0000
+++ b/cross/Makefile Sun Jun 19 16:20:27 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2015/12/10 23:07:21 ryoon Exp $
+# $NetBSD: Makefile,v 1.66 2016/06/19 16:20:27 wiz Exp $
#
COMMENT= Cross-platform development utilities
@@ -15,10 +15,11 @@
SUBDIR+= avrdude
SUBDIR+= bfd-crunchide
SUBDIR+= bfd-mdsetimage
-SUBDIR+= binutils
SUBDIR+= binutils-mips-current
SUBDIR+= bossa
SUBDIR+= cc65
+SUBDIR+= cross-binutils
+#SUBDIR+= cross-libtool-base # added here to keep pkglint happy
SUBDIR+= dasm
SUBDIR+= dfu-programmer
SUBDIR+= freemint-binutils
@@ -35,7 +36,6 @@
SUBDIR+= h8300-hms-binutils
SUBDIR+= h8300-hms-gcc
SUBDIR+= icdprog
-#SUBDIR+= libtool-base # added here to keep pkglint happy
SUBDIR+= mingw
SUBDIR+= mingw-binutils
SUBDIR+= mingw-gcc
diff -r 985c805f016f -r 5d2203bb2ca6 cross/bfd-crunchide/Makefile
--- a/cross/bfd-crunchide/Makefile Sun Jun 19 16:19:04 2016 +0000
+++ b/cross/bfd-crunchide/Makefile Sun Jun 19 16:20:27 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2015/12/26 23:07:11 dholland Exp $
+# $NetBSD: Makefile,v 1.26 2016/06/19 16:20:27 wiz Exp $
DISTNAME= bfd-crunchide-1.2
CATEGORIES= cross
@@ -13,20 +13,21 @@
WRKSRC= ${WRKDIR}
NO_CONFIGURE= yes
-USE_CROSSBASE= yes
-CPPFLAGS+= -I${PREFIX}/include
+CPPFLAGS+= -I${PREFIX}/cross/include
MAKE_ENV+= LIBS=${BFD_LIBS:Q}
MAKE_ENV+= ${BSD_MAKE_ENV}
USE_BSD_MAKEFILE=yes
+MAKE_FLAGS+= PREFIX=${PREFIX}/cross
+MAKE_FLAGS+= BINDIR=${PREFIX}/cross/bin
-BFD_LIBS= ${PREFIX}/lib/libbfd.a ${PREFIX}/lib/libiberty.a ${PREFIX}/lib/libintl.a
+BFD_LIBS= ${PREFIX}/cross/lib/libbfd.a ${PREFIX}/cross/lib/libiberty.a ${PREFIX}/cross/lib/libintl.a
-INSTALLATION_DIRS= bin
+INSTALLATION_DIRS= cross/bin
do-extract:
@${MKDIR} ${WRKSRC}
@${CP} ${FILESDIR}/Makefile ${FILESDIR}/crunchide.1 ${FILESDIR}/crunchide.c \
${WRKSRC}
-.include "../../cross/binutils/buildlink3.mk"
+.include "../../cross/cross-binutils/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 985c805f016f -r 5d2203bb2ca6 cross/bfd-crunchide/PLIST
--- a/cross/bfd-crunchide/PLIST Sun Jun 19 16:19:04 2016 +0000
+++ b/cross/bfd-crunchide/PLIST Sun Jun 19 16:20:27 2016 +0000
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:03:24 zuntum Exp $
-bin/crunchide
+@comment $NetBSD: PLIST,v 1.2 2016/06/19 16:20:27 wiz Exp $
+cross/bin/crunchide
diff -r 985c805f016f -r 5d2203bb2ca6 cross/bfd-mdsetimage/Makefile
--- a/cross/bfd-mdsetimage/Makefile Sun Jun 19 16:19:04 2016 +0000
+++ b/cross/bfd-mdsetimage/Makefile Sun Jun 19 16:20:27 2016 +0000
@@ -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 @@
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 @@
@${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 -r 985c805f016f -r 5d2203bb2ca6 cross/bfd-mdsetimage/PLIST
--- a/cross/bfd-mdsetimage/PLIST Sun Jun 19 16:19:04 2016 +0000
+++ b/cross/bfd-mdsetimage/PLIST Sun Jun 19 16:20:27 2016 +0000
@@ -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
diff -r 985c805f016f -r 5d2203bb2ca6 cross/mingw-binutils/Makefile
--- a/cross/mingw-binutils/Makefile Sun Jun 19 16:19:04 2016 +0000
+++ b/cross/mingw-binutils/Makefile Sun Jun 19 16:20:27 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2012/10/09 17:32:33 marino Exp $
+# $NetBSD: Makefile,v 1.6 2016/06/19 16:20:27 wiz Exp $
DISTNAME= binutils-2.18
PKGNAME= mingw-${DISTNAME:S/-src//}
@@ -11,18 +11,18 @@
HOMEPAGE= http://mingw.sourceforge.net/
COMMENT= GNU binutils for win32 cross-development
-USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-USE_CROSSBASE= yes
USE_TOOLS+= pax
INFO_FILES= yes
BUILDLINK_TRANSFORM+= rm:-Werror
+INSTALLATION_DIRS+= cross/bin
+
post-install:
.for f in windres dllwrap
- ${LN} -fs ${PREFIX}/bin/${MINGW_TARGET}-${f} \
- ${DESTDIR}${PREFIX}/${MINGW_TARGET}/bin/${f}
+ ${LN} -fs ${PREFIX}/cross/bin/${MINGW_TARGET}-${f} \
+ ${DESTDIR}${PREFIX}/cross/${MINGW_TARGET}/bin/${f}
.endfor
.include "../../cross/mingw/Makefile.common"
diff -r 985c805f016f -r 5d2203bb2ca6 cross/mingw-binutils/PLIST
--- a/cross/mingw-binutils/PLIST Sun Jun 19 16:19:04 2016 +0000
+++ b/cross/mingw-binutils/PLIST Sun Jun 19 16:20:27 2016 +0000
@@ -1,125 +1,125 @@
-@comment $NetBSD: PLIST,v 1.2 2010/06/24 20:06:28 asau Exp $
-bin/${MINGW_TARGET}-addr2line
-bin/${MINGW_TARGET}-ar
-bin/${MINGW_TARGET}-as
-bin/${MINGW_TARGET}-c++filt
-bin/${MINGW_TARGET}-dlltool
-bin/${MINGW_TARGET}-dllwrap
-bin/${MINGW_TARGET}-gprof
-bin/${MINGW_TARGET}-ld
-bin/${MINGW_TARGET}-nm
-bin/${MINGW_TARGET}-objcopy
-bin/${MINGW_TARGET}-objdump
-bin/${MINGW_TARGET}-ranlib
-bin/${MINGW_TARGET}-readelf
-bin/${MINGW_TARGET}-size
-bin/${MINGW_TARGET}-strings
-bin/${MINGW_TARGET}-strip
-bin/${MINGW_TARGET}-windmc
-bin/${MINGW_TARGET}-windres
-${MINGW_TARGET}/bin/ar
-${MINGW_TARGET}/bin/as
-${MINGW_TARGET}/bin/dlltool
-${MINGW_TARGET}/bin/ld
-${MINGW_TARGET}/bin/nm
-${MINGW_TARGET}/bin/objcopy
-${MINGW_TARGET}/bin/objdump
-${MINGW_TARGET}/bin/ranlib
-${MINGW_TARGET}/bin/strip
-${MINGW_TARGET}/bin/windres
-${MINGW_TARGET}/bin/dllwrap
-${MINGW_TARGET}/lib/ldscripts/i386pe.x
-${MINGW_TARGET}/lib/ldscripts/i386pe.xbn
-${MINGW_TARGET}/lib/ldscripts/i386pe.xn
-${MINGW_TARGET}/lib/ldscripts/i386pe.xr
-${MINGW_TARGET}/lib/ldscripts/i386pe.xu
-info/as.info
-info/bfd.info
-info/binutils.info
-info/configure.info
-info/gprof.info
-info/ld.info
-info/standards.info
-man/man1/${MINGW_TARGET}-addr2line.1
-man/man1/${MINGW_TARGET}-ar.1
-man/man1/${MINGW_TARGET}-as.1
-man/man1/${MINGW_TARGET}-c++filt.1
-man/man1/${MINGW_TARGET}-dlltool.1
-man/man1/${MINGW_TARGET}-gprof.1
-man/man1/${MINGW_TARGET}-ld.1
-man/man1/${MINGW_TARGET}-nlmconv.1
-man/man1/${MINGW_TARGET}-nm.1
-man/man1/${MINGW_TARGET}-objcopy.1
-man/man1/${MINGW_TARGET}-objdump.1
-man/man1/${MINGW_TARGET}-ranlib.1
-man/man1/${MINGW_TARGET}-readelf.1
-man/man1/${MINGW_TARGET}-size.1
-man/man1/${MINGW_TARGET}-strings.1
-man/man1/${MINGW_TARGET}-strip.1
-man/man1/${MINGW_TARGET}-windmc.1
-man/man1/${MINGW_TARGET}-windres.1
-share/locale/da/LC_MESSAGES/bfd.mo
-share/locale/da/LC_MESSAGES/binutils.mo
-share/locale/da/LC_MESSAGES/gprof.mo
-share/locale/da/LC_MESSAGES/ld.mo
-share/locale/da/LC_MESSAGES/opcodes.mo
-share/locale/de/LC_MESSAGES/gprof.mo
-share/locale/de/LC_MESSAGES/opcodes.mo
-share/locale/es/LC_MESSAGES/bfd.mo
-share/locale/es/LC_MESSAGES/binutils.mo
-share/locale/es/LC_MESSAGES/gas.mo
-share/locale/es/LC_MESSAGES/gprof.mo
-share/locale/es/LC_MESSAGES/ld.mo
-share/locale/es/LC_MESSAGES/opcodes.mo
-share/locale/fi/LC_MESSAGES/binutils.mo
-share/locale/fi/LC_MESSAGES/gprof.mo
-share/locale/fi/LC_MESSAGES/ld.mo
-share/locale/fi/LC_MESSAGES/opcodes.mo
-share/locale/fr/LC_MESSAGES/bfd.mo
-share/locale/fr/LC_MESSAGES/binutils.mo
-share/locale/fr/LC_MESSAGES/gas.mo
-share/locale/fr/LC_MESSAGES/gprof.mo
-share/locale/fr/LC_MESSAGES/ld.mo
-share/locale/fr/LC_MESSAGES/opcodes.mo
-share/locale/ga/LC_MESSAGES/gprof.mo
-share/locale/ga/LC_MESSAGES/ld.mo
-share/locale/ga/LC_MESSAGES/opcodes.mo
-share/locale/id/LC_MESSAGES/gprof.mo
-share/locale/id/LC_MESSAGES/opcodes.mo
-share/locale/ja/LC_MESSAGES/bfd.mo
-share/locale/ja/LC_MESSAGES/binutils.mo
-share/locale/ms/LC_MESSAGES/gprof.mo
-share/locale/nl/LC_MESSAGES/opcodes.mo
-share/locale/pt_BR/LC_MESSAGES/gprof.mo
-share/locale/pt_BR/LC_MESSAGES/opcodes.mo
-share/locale/ro/LC_MESSAGES/bfd.mo
-share/locale/ro/LC_MESSAGES/binutils.mo
-share/locale/ro/LC_MESSAGES/opcodes.mo
-share/locale/ru/LC_MESSAGES/binutils.mo
-share/locale/rw/LC_MESSAGES/bfd.mo
-share/locale/rw/LC_MESSAGES/binutils.mo
-share/locale/rw/LC_MESSAGES/gas.mo
-share/locale/rw/LC_MESSAGES/gprof.mo
-share/locale/sv/LC_MESSAGES/bfd.mo
-share/locale/sv/LC_MESSAGES/binutils.mo
-share/locale/sv/LC_MESSAGES/gprof.mo
-share/locale/sv/LC_MESSAGES/ld.mo
-share/locale/sv/LC_MESSAGES/opcodes.mo
-share/locale/tr/LC_MESSAGES/bfd.mo
-share/locale/tr/LC_MESSAGES/binutils.mo
-share/locale/tr/LC_MESSAGES/gas.mo
-share/locale/tr/LC_MESSAGES/gprof.mo
-share/locale/tr/LC_MESSAGES/ld.mo
-share/locale/tr/LC_MESSAGES/opcodes.mo
-share/locale/uk/LC_MESSAGES/binutils.mo
-share/locale/vi/LC_MESSAGES/bfd.mo
-share/locale/vi/LC_MESSAGES/binutils.mo
-share/locale/vi/LC_MESSAGES/gprof.mo
-share/locale/vi/LC_MESSAGES/ld.mo
-share/locale/vi/LC_MESSAGES/opcodes.mo
-share/locale/zh_CN/LC_MESSAGES/bfd.mo
-share/locale/zh_CN/LC_MESSAGES/binutils.mo
-share/locale/zh_CN/LC_MESSAGES/ld.mo
-share/locale/zh_CN/LC_MESSAGES/opcodes.mo
-share/locale/zh_TW/LC_MESSAGES/binutils.mo
-share/locale/zh_TW/LC_MESSAGES/ld.mo
+@comment $NetBSD: PLIST,v 1.3 2016/06/19 16:20:27 wiz Exp $
+cross/bin/${MINGW_TARGET}-addr2line
+cross/bin/${MINGW_TARGET}-ar
+cross/bin/${MINGW_TARGET}-as
+cross/bin/${MINGW_TARGET}-c++filt
+cross/bin/${MINGW_TARGET}-dlltool
+cross/bin/${MINGW_TARGET}-dllwrap
+cross/bin/${MINGW_TARGET}-gprof
+cross/bin/${MINGW_TARGET}-ld
+cross/bin/${MINGW_TARGET}-nm
+cross/bin/${MINGW_TARGET}-objcopy
+cross/bin/${MINGW_TARGET}-objdump
+cross/bin/${MINGW_TARGET}-ranlib
+cross/bin/${MINGW_TARGET}-readelf
+cross/bin/${MINGW_TARGET}-size
+cross/bin/${MINGW_TARGET}-strings
Home |
Main Index |
Thread Index |
Old Index