diff options
author | rillig <rillig@pkgsrc.org> | 2019-06-08 10:53:26 +0000 |
---|---|---|
committer | rillig <rillig@pkgsrc.org> | 2019-06-08 10:53:26 +0000 |
commit | 95ce3f227afadd1efad90c5547c0e1a45fe2206e (patch) | |
tree | 957dcef3c562fafb49e0c5f10a93918fcd883bac | |
parent | da7926cedfcd3a80a37f3a5db3b7ef9601211bcb (diff) | |
download | pkgsrc-95ce3f227afadd1efad90c5547c0e1a45fe2206e.tar.gz |
cross/*: let pkglint autofix indentation and variable alignment
pkglint -Wall -F -r cross
xtensa-esp32-elf-gcc has been manually edited afterwards because when
realigning variable assignments, pkglint only allows one long outlier
line. This package has two long SITES.* lines, therefore pkglint wanted
to indent the variable values much further to the right. This needs to be
fixed in pkglint.
41 files changed, 147 insertions, 136 deletions
diff --git a/cross/aarch64-none-elf-gcc/Makefile b/cross/aarch64-none-elf-gcc/Makefile index 9436935f311..c5e04150116 100644 --- a/cross/aarch64-none-elf-gcc/Makefile +++ b/cross/aarch64-none-elf-gcc/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.10 2019/03/23 14:16:11 tnn Exp $ +# $NetBSD: Makefile,v 1.11 2019/06/08 10:53:26 rillig Exp $ DISTNAME= gcc-8.2.0 PKGNAME= cross-aarch64-none-elf-${DISTNAME} CATEGORIES= cross MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${PKGVERSION_NOREV}/} -NEWLIBVER= 3.0.0 -SITES.newlib-${NEWLIBVER}.tar.gz=https://www.sourceware.org/pub/newlib/ +NEWLIBVER= 3.0.0 +SITES.newlib-${NEWLIBVER}.tar.gz= https://www.sourceware.org/pub/newlib/ DISTFILES= ${DEFAULT_DISTFILES} \ newlib-${NEWLIBVER}.tar.gz EXTRACT_USING= bsdtar @@ -18,7 +18,7 @@ EXTRACT_SUFX= .tar.xz # for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=33549 # use makeinfo from pkgsrc/devel/gtexinfo. TOOL_DEPENDS+= gtexinfo>=5.1:../../devel/gtexinfo -_TOOLS_USE_PKGSRC.makeinfo=yes +_TOOLS_USE_PKGSRC.makeinfo= yes DEPENDS+= cross-aarch64-none-elf-binutils-[0-9]*:../../cross/aarch64-none-elf-binutils diff --git a/cross/arm-none-eabi-gdb/Makefile b/cross/arm-none-eabi-gdb/Makefile index c692af699f6..50e6df013e0 100644 --- a/cross/arm-none-eabi-gdb/Makefile +++ b/cross/arm-none-eabi-gdb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2016/02/02 06:30:34 dbj Exp $ +# $NetBSD: Makefile,v 1.3 2019/06/08 10:53:26 rillig Exp $ DISTNAME= gdb-7.10 PKGNAME= cross-arm-none-eabi-${DISTNAME} @@ -27,7 +27,7 @@ INFO_FILES= yes .include "../../mk/bsd.prefs.mk" -PLIST_VARS+= charsetalias +PLIST_VARS+= charsetalias # this theoretically should match check for # install-exec-localcharset in ${WRKSRC}/gdb/gnulib/import/Makefile.am .if ${OPSYS} != Darwin diff --git a/cross/avr-binutils/buildlink3.mk b/cross/avr-binutils/buildlink3.mk index 6afdf81b16c..065c12a79e5 100644 --- a/cross/avr-binutils/buildlink3.mk +++ b/cross/avr-binutils/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:03:58 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2019/06/08 10:53:26 rillig Exp $ BUILDLINK_TREE+= avr-binutils .if !defined(AVR_BINUTILS_BUILDLINK3_MK) AVR_BINUTILS_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.avr-binutils+= avr-binutils>=2.23 -BUILDLINK_PKGSRCDIR.avr-binutils?= ../../cross/avr-binutils +BUILDLINK_API_DEPENDS.avr-binutils+= avr-binutils>=2.23 +BUILDLINK_PKGSRCDIR.avr-binutils?= ../../cross/avr-binutils #BUILDLINK_FNAME_TRANSFORM.avr-binutils+= -e "s,${AVR_TARGET}/lib,lib/,g" .endif # AVR_BINUTILS_BUILDLINK3_MK diff --git a/cross/avr-binutils/distinfo b/cross/avr-binutils/distinfo index ac8015b9a61..a8456cbdab1 100644 --- a/cross/avr-binutils/distinfo +++ b/cross/avr-binutils/distinfo @@ -1,14 +1,14 @@ -$NetBSD: distinfo,v 1.12 2018/07/16 12:56:48 mef Exp $ +$NetBSD: distinfo,v 1.13 2019/06/08 10:53:26 rillig Exp $ SHA1 (binutils-2.30.tar.bz2) = 33d807f7fa680b00439eb5560acd0c2ef645e5f9 RMD160 (binutils-2.30.tar.bz2) = 5b6152ff36d55da3b5da3a21b372897da66d953c SHA512 (binutils-2.30.tar.bz2) = c3ce91aa20f058ec589bf18c722bf651331b394db6378900cc813cc0eea3a331a96584d5ae090630b627369510397dccc9edfcd43d4aeefc99579f277a05c72c Size (binutils-2.30.tar.bz2) = 29541188 bytes SHA1 (patch-ab) = e2bc22866d8e04b0d670509f3295da5f0e535ac8 -SHA1 (patch-ad) = dff2b0f88af0d6f0c77f67f99d62a53d4d57e468 +SHA1 (patch-ad) = c361ec47cd639d446bec200355b7d051ae1165d3 SHA1 (patch-ae) = fff6693a610b26aa60e1d96ad634d15d11afbe05 SHA1 (patch-af) = 5fa08da0b31da042eb30cce683f7b7b1feb3196b SHA1 (patch-ag) = 689bd4207fc6afe33cc81edaf5d97b4a0ba31554 -SHA1 (patch-ah) = e60983eb83d28da1eb165ae91bf68872703100fe +SHA1 (patch-ah) = 5afb8144cd2fcfe0d8e5b32b89fe1c9ab1d2aa9e SHA1 (patch-ai) = ed0814d908d8350ede28d439ce8cd2e77cbaaa2a SHA1 (patch-aj) = fd2a66979f68350a53960defdaf5e9e5018ec59a diff --git a/cross/avr-binutils/patches/patch-ad b/cross/avr-binutils/patches/patch-ad index f038c0411a5..56055269f54 100644 --- a/cross/avr-binutils/patches/patch-ad +++ b/cross/avr-binutils/patches/patch-ad @@ -1,7 +1,7 @@ -$NetBSD: patch-ad,v 1.4 2017/01/30 12:07:36 mef Exp $ +$NetBSD: patch-ad,v 1.5 2019/06/08 10:53:26 rillig Exp $ Avoid installing info (which duplicates with other CPU) - + --- etc/Makefile.in.orig 2014-10-14 16:32:02.000000000 +0900 +++ etc/Makefile.in 2017-01-29 11:59:44.000000000 +0900 @@ -68,7 +68,7 @@ config.status: $(srcdir)/configure diff --git a/cross/avr-binutils/patches/patch-ah b/cross/avr-binutils/patches/patch-ah index e556a7d9807..fa72b7ea22d 100644 --- a/cross/avr-binutils/patches/patch-ah +++ b/cross/avr-binutils/patches/patch-ah @@ -1,8 +1,9 @@ -$NetBSD: patch-ah,v 1.4 2017/01/30 12:07:36 mef Exp $ +$NetBSD: patch-ah,v 1.5 2019/06/08 10:53:26 rillig Exp $ Avoid installing po (nls) files # Automake 1.10+ disables lex and yacc output file regeneration if + --- binutils/Makefile.in.orig 2016-08-03 17:16:40.000000000 +0900 +++ binutils/Makefile.in 2017-01-29 12:01:49.000000000 +0900 @@ -464,7 +464,7 @@ zlibdir = @zlibdir@ diff --git a/cross/avr-gdb/Makefile b/cross/avr-gdb/Makefile index 5cfb24a409f..734a08c57a0 100644 --- a/cross/avr-gdb/Makefile +++ b/cross/avr-gdb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2017/09/04 15:57:01 joerg Exp $ +# $NetBSD: Makefile,v 1.24 2019/06/08 10:53:26 rillig Exp $ DISTNAME= gdb-7.12.1 PKGNAME= ${DISTNAME:S/^/avr-/} @@ -23,7 +23,7 @@ CONFIGURE_ENV+= gdb_cv_var_elf=yes MAKE_ENV+= gdb_cv_var_elf=yes # Native gdb has following lines also activated -#CONFIGURE_ENV+= gdb_cv_struct_lwp=yes +#CONFIGURE_ENV+= gdb_cv_struct_lwp=yes #MAKE_ENV+= gdb_cv_struct_lwp=yes INSTALLATION_DIRS= bin diff --git a/cross/avr-libc/Makefile b/cross/avr-libc/Makefile index b8617b56ba7..a3b40117aa3 100644 --- a/cross/avr-libc/Makefile +++ b/cross/avr-libc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2018/08/22 09:43:10 wiz Exp $ +# $NetBSD: Makefile,v 1.49 2019/06/08 10:53:26 rillig Exp $ DISTNAME= avr-libc-2.0.0 PKGREVISION= 1 @@ -13,9 +13,9 @@ LICENSE= modified-bsd USE_TOOLS+= gmake perl GNU_CONFIGURE= yes -USE_GNU_CONFIGURE_HOST= no +USE_GNU_CONFIGURE_HOST= no -CONFIGURE_ARGS+= --build=${MACHINE_GNU_PLATFORM:Q} +CONFIGURE_ARGS+= --build=${MACHINE_GNU_PLATFORM} CONFIGURE_ARGS+= --host=avr CONFIGURE_ARGS+= --disable-versioned-doc CONFIGURE_ARGS+= CC=${PREFIX}/bin/avr-gcc diff --git a/cross/avr-libc/options.mk b/cross/avr-libc/options.mk index 8d877ac314b..7f7ed343b8e 100644 --- a/cross/avr-libc/options.mk +++ b/cross/avr-libc/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2017/10/03 15:12:42 wiz Exp $ +# $NetBSD: options.mk,v 1.3 2019/06/08 10:53:26 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.avr-libc PKG_SUPPORTED_OPTIONS+= doc @@ -9,31 +9,31 @@ PLIST_VARS+= doc .if !empty(PKG_OPTIONS:Mdoc) CONFIGURE_ARGS+= --enable-doc -BUILD_DEPENDS+= doxygen>=1.8.9.1.nb1:../../devel/doxygen -BUILD_DEPENDS+= tex-psnfss-[0-9]*:../../fonts/tex-psnfss -BUILD_DEPENDS+= tex-wasysym-[0-9]*:../../fonts/tex-wasysym -BUILD_DEPENDS+= netpbm-[0-9]*:../../graphics/netpbm -BUILD_DEPENDS+= tex-epstopdf-[0-9]*:../../graphics/tex-epstopdf -BUILD_DEPENDS+= tex-adjustbox-[0-9]*:../../print/tex-adjustbox -BUILD_DEPENDS+= tex-caption-[0-9]*:../../print/tex-caption -BUILD_DEPENDS+= tex-collectbox-[0-9]*:../../print/tex-collectbox -BUILD_DEPENDS+= tex-colortbl-[0-9]*:../../print/tex-colortbl -BUILD_DEPENDS+= tex-fancyhdr-[0-9]*:../../print/tex-fancyhdr -BUILD_DEPENDS+= tex-float-[0-9]*:../../print/tex-float -BUILD_DEPENDS+= tex-geometry-[0-9]*:../../print/tex-geometry -BUILD_DEPENDS+= tex-graphics-cfg-[0-9]*:../../print/tex-graphics-cfg -BUILD_DEPENDS+= tex-hyperref-[0-9]*:../../print/tex-hyperref -BUILD_DEPENDS+= tex-latex-bin-[0-9]*:../../print/tex-latex-bin -BUILD_DEPENDS+= tex-multirow-[0-9]*:../../print/tex-multirow -BUILD_DEPENDS+= tex-natbib-[0-9]*:../../print/tex-natbib -BUILD_DEPENDS+= tex-pgf-[0-9]*:../../print/tex-pgf -BUILD_DEPENDS+= tex-sectsty-[0-9]*:../../print/tex-sectsty -BUILD_DEPENDS+= tex-tabu-[0-9]*:../../print/tex-tabu -BUILD_DEPENDS+= tex-tocloft-[0-9]*:../../print/tex-tocloft -BUILD_DEPENDS+= tex-xcolor-[0-9]*:../../print/tex-xcolor -BUILD_DEPENDS+= tex-xkeyval-[0-9]*:../../print/tex-xkeyval -BUILD_DEPENDS+= fig2dev-[0-9]*:../../print/fig2dev -BUILD_DEPENDS+= makeindexk-[0-9]*:../../textproc/makeindexk +BUILD_DEPENDS+= doxygen>=1.8.9.1.nb1:../../devel/doxygen +BUILD_DEPENDS+= tex-psnfss-[0-9]*:../../fonts/tex-psnfss +BUILD_DEPENDS+= tex-wasysym-[0-9]*:../../fonts/tex-wasysym +BUILD_DEPENDS+= netpbm-[0-9]*:../../graphics/netpbm +BUILD_DEPENDS+= tex-epstopdf-[0-9]*:../../graphics/tex-epstopdf +BUILD_DEPENDS+= tex-adjustbox-[0-9]*:../../print/tex-adjustbox +BUILD_DEPENDS+= tex-caption-[0-9]*:../../print/tex-caption +BUILD_DEPENDS+= tex-collectbox-[0-9]*:../../print/tex-collectbox +BUILD_DEPENDS+= tex-colortbl-[0-9]*:../../print/tex-colortbl +BUILD_DEPENDS+= tex-fancyhdr-[0-9]*:../../print/tex-fancyhdr +BUILD_DEPENDS+= tex-float-[0-9]*:../../print/tex-float +BUILD_DEPENDS+= tex-geometry-[0-9]*:../../print/tex-geometry +BUILD_DEPENDS+= tex-graphics-cfg-[0-9]*:../../print/tex-graphics-cfg +BUILD_DEPENDS+= tex-hyperref-[0-9]*:../../print/tex-hyperref +BUILD_DEPENDS+= tex-latex-bin-[0-9]*:../../print/tex-latex-bin +BUILD_DEPENDS+= tex-multirow-[0-9]*:../../print/tex-multirow +BUILD_DEPENDS+= tex-natbib-[0-9]*:../../print/tex-natbib +BUILD_DEPENDS+= tex-pgf-[0-9]*:../../print/tex-pgf +BUILD_DEPENDS+= tex-sectsty-[0-9]*:../../print/tex-sectsty +BUILD_DEPENDS+= tex-tabu-[0-9]*:../../print/tex-tabu +BUILD_DEPENDS+= tex-tocloft-[0-9]*:../../print/tex-tocloft +BUILD_DEPENDS+= tex-xcolor-[0-9]*:../../print/tex-xcolor +BUILD_DEPENDS+= tex-xkeyval-[0-9]*:../../print/tex-xkeyval +BUILD_DEPENDS+= fig2dev-[0-9]*:../../print/fig2dev +BUILD_DEPENDS+= makeindexk-[0-9]*:../../textproc/makeindexk post-extract: ${MKDIR} ${WRKSRC}/doc/api/latex_src @@ -50,10 +50,10 @@ post-install: ## delete following or similar files, which includes PATH at build time. ##_usr_pkgsrc_cross_avr-libc_work_avr-libc-1.8.0_libc_string_.3 ${RM} ${DESTDIR}${PREFIX}/share/doc/avr-libc/man/man3/*${PKGVERSION_NOREV}* -.for f in Makefile demo.c demo.bin demo.hex demo.pdf demo.srec +. for f in Makefile demo.c demo.bin demo.hex demo.pdf demo.srec ${INSTALL_DATA} ${WRKSRC}/doc/examples/demo/${f} \ ${DESTDIR}${PREFIX}/share/doc/avr-libc/examples/demo -.endfor +. endfor PLIST.doc= yes diff --git a/cross/avrdude/Makefile b/cross/avrdude/Makefile index 2e3e6eb605c..4e0544cd063 100644 --- a/cross/avrdude/Makefile +++ b/cross/avrdude/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2019/01/26 02:44:34 gdt Exp $ +# $NetBSD: Makefile,v 1.46 2019/06/08 10:53:27 rillig Exp $ DISTNAME= avrdude-6.3 PKGREVISION= 2 @@ -22,7 +22,7 @@ USE_TOOLS+= autoconf automake autoreconf lex makeinfo texi2html yacc # Upstream does not documentat that GNU make is required, but BSD make # leads to inexplicable errors about libavrdude. # \todo Resolve and/or discuss with upstream. -USE_TOOLS+= gmake +USE_TOOLS+= gmake USE_LIBTOOL= yes INFO_FILES= yes EGDIR= ${PREFIX}/share/examples/avrdude @@ -31,7 +31,7 @@ CONF_FILES_PERMS= ${EGDIR}/avrdude.conf ${PKG_SYSCONFDIR}/avrdude.conf \ CONFIGURE_ARGS+= --enable-doc CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ENV+= DEFAULT_SER_PORT=${DEFAULT_SERIAL_DEVICE:Q} +CONFIGURE_ENV+= DEFAULT_SER_PORT=${DEFAULT_SERIAL_DEVICE} PLIST_SUBST+= DISTNAME=${DISTNAME} # The autotools used by this pkg are older than what's in pkgsrc diff --git a/cross/bfd-crunchide/Makefile b/cross/bfd-crunchide/Makefile index e27ea6bbcb6..fab3984060f 100644 --- a/cross/bfd-crunchide/Makefile +++ b/cross/bfd-crunchide/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2016/06/19 16:23:59 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2019/06/08 10:53:27 rillig Exp $ DISTNAME= bfd-crunchide-1.2 PKGREVISION= 1 @@ -14,12 +14,12 @@ BUILDLINK_DEPMETHOD.cross-binutils= build WRKSRC= ${WRKDIR} NO_CONFIGURE= yes -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 +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}/cross/lib/libbfd.a ${PREFIX}/cross/lib/libiberty.a ${PREFIX}/cross/lib/libintl.a diff --git a/cross/binutils-mips-current/Makefile b/cross/binutils-mips-current/Makefile index cdc6e7c6e3a..5c360223d87 100644 --- a/cross/binutils-mips-current/Makefile +++ b/cross/binutils-mips-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2018/12/09 21:05:32 adam Exp $ +# $NetBSD: Makefile,v 1.8 2019/06/08 10:53:27 rillig Exp $ # # GNU binutils snapshot, configured to target MIPS (NetBSD/playstation2) @@ -28,7 +28,7 @@ CONFIGURE_ARGS+= --target=${PLATFORM} MAKE_ARGS+= CFLAGS="${CFLAGS}" -PLIST_SUBST+= LOCALBASE=${LOCALBASE:Q} +PLIST_SUBST+= LOCALBASE=${PREFIX} BINDIR= ${PREFIX}/bin diff --git a/cross/bossa/Makefile b/cross/bossa/Makefile index 32c88020017..3e5845fe486 100644 --- a/cross/bossa/Makefile +++ b/cross/bossa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2018/11/14 22:21:11 kleink Exp $ +# $NetBSD: Makefile,v 1.18 2019/06/08 10:53:27 rillig Exp $ PKGNAME= bossa-20140109 DISTNAME= b-o-s-s-a-code-05bfcc39bc0453c3028b1161175b95a81af7a901 @@ -11,7 +11,7 @@ HOMEPAGE= https://sourceforge.net/projects/b-o-s-s-a/ COMMENT= Open source SAM-BA compatible Atmel ARM programmer LICENSE= gnu-gpl-v3 -INSTALLATION_DIRS= bin +INSTALLATION_DIRS= bin LDFLAGS+= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.readline}/lib \ -L${BUILDLINK_PREFIX.readline}/lib diff --git a/cross/cross-binutils/Makefile b/cross/cross-binutils/Makefile index 9b2a27afce7..e122071ae28 100644 --- a/cross/cross-binutils/Makefile +++ b/cross/cross-binutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2016/07/09 06:37:58 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2019/06/08 10:53:27 rillig Exp $ # # GNU binutils configured to hold `as many targets as the cross system is # capable of using'. Configures and builds everything except gas, which @@ -32,7 +32,7 @@ CONFIGURE_ARGS+= --target=i386-linux MAKE_ARGS+= CFLAGS="${CFLAGS}" BUILD_TARGET= all-binutils all-ld -PLIST_SUBST+= LOCALBASE=${LOCALBASE:Q} +PLIST_SUBST+= LOCALBASE=${PREFIX} BINDIR= ${PREFIX}/cross/libexec/binutils diff --git a/cross/dfu-programmer/Makefile b/cross/dfu-programmer/Makefile index 43565a87ae6..b70a96df10d 100644 --- a/cross/dfu-programmer/Makefile +++ b/cross/dfu-programmer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2018/02/27 23:56:08 khorben Exp $ +# $NetBSD: Makefile,v 1.7 2019/06/08 10:53:27 rillig Exp $ # DISTNAME= dfu-programmer-0.7.2 @@ -11,8 +11,8 @@ HOMEPAGE= http://dfu-programmer.sourceforge.net/ COMMENT= Programmer for Atmel USB DFU Bootloader LICENSE= gnu-gpl-v2 -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --disable-libusb_1_0 +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --disable-libusb_1_0 .include "../../mk/libusb.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cross/freemint-binutils/Makefile b/cross/freemint-binutils/Makefile index d6b95f12f8e..5862e7e323a 100644 --- a/cross/freemint-binutils/Makefile +++ b/cross/freemint-binutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2018/10/26 10:09:30 jperkin Exp $ +# $NetBSD: Makefile,v 1.5 2019/06/08 10:53:27 rillig Exp $ DISTNAME= binutils-2.24 PKGNAME= cross-freemint-${DISTNAME} @@ -11,8 +11,8 @@ HOMEPAGE= http://vincent.riviere.free.fr/soft/m68k-atari-mint/ COMMENT= Cross binutils for FreeMiNT LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3 -PATCH_SITES= http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/ -PATCHFILES= binutils-2.24-mint-20131217.patch.bz2 +PATCH_SITES= http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/ +PATCHFILES= binutils-2.24-mint-20131217.patch.bz2 PATCH_DIST_STRIP= -p1 FREEMINT_PREFIX= ${PREFIX}/cross-freemint diff --git a/cross/freemint-cflib/Makefile b/cross/freemint-cflib/Makefile index d941c4dd48a..9a0f74e866f 100644 --- a/cross/freemint-cflib/Makefile +++ b/cross/freemint-cflib/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.1 2013/09/12 14:05:26 ryoon Exp $ +# $NetBSD: Makefile,v 1.2 2019/06/08 10:53:27 rillig Exp $ -DISTNAME= cflib-CVS-20130415 +DISTNAME= cflib-CVS-20130415 PKGNAME= cross-freemint-${DISTNAME:S/CVS-//} CATEGORIES= cross MASTER_SITES= http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/ diff --git a/cross/freemint-gemlib/Makefile b/cross/freemint-gemlib/Makefile index 6310c419d53..4d1a602689f 100644 --- a/cross/freemint-gemlib/Makefile +++ b/cross/freemint-gemlib/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.1 2013/09/12 14:04:41 ryoon Exp $ +# $NetBSD: Makefile,v 1.2 2019/06/08 10:53:27 rillig Exp $ -DISTNAME= gemlib-CVS-20130415 +DISTNAME= gemlib-CVS-20130415 PKGNAME= cross-freemint-${DISTNAME:S/CVS-//} CATEGORIES= cross MASTER_SITES= http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/ diff --git a/cross/freemint-ldg/Makefile b/cross/freemint-ldg/Makefile index 7acff9b2f0f..83f8b82d11d 100644 --- a/cross/freemint-ldg/Makefile +++ b/cross/freemint-ldg/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2014/01/19 07:36:18 ryoon Exp $ +# $NetBSD: Makefile,v 1.3 2019/06/08 10:53:28 rillig Exp $ -DISTNAME= ldg-SVN-20131104 +DISTNAME= ldg-SVN-20131104 PKGNAME= cross-freemint-${DISTNAME:S/SVN-//} CATEGORIES= cross MASTER_SITES= http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/ @@ -10,11 +10,11 @@ COMMENT= LDG for FreeMiNT EXTRACT_SUFX= .tar.bz2 LICENSE= gnu-lgpl-v2.1 -SUBST_CLASSES+= dos_eol -SUBST_MESSAGE.dos_eol= Removing DOS line-ends -SUBST_STAGE.dos_eol= post-extract -SUBST_FILES.dos_eol= src/ldgmgr/gcc.mak -SUBST_FILES.dos_eol+= src/ldgd/gcc.mak +SUBST_CLASSES+= dos_eol +SUBST_MESSAGE.dos_eol= Removing DOS line-ends +SUBST_STAGE.dos_eol= post-extract +SUBST_FILES.dos_eol= src/ldgmgr/gcc.mak +SUBST_FILES.dos_eol+= src/ldgd/gcc.mak SUBST_FILTER_CMD.dos_eol= ${TR} -d '\r' diff --git a/cross/gcc-mips-current/Makefile b/cross/gcc-mips-current/Makefile index b29782409b4..8260b0c275c 100644 --- a/cross/gcc-mips-current/Makefile +++ b/cross/gcc-mips-current/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.14 2018/12/09 21:05:32 adam Exp $ +# $NetBSD: Makefile,v 1.15 2019/06/08 10:53:28 rillig Exp $ -GCC_DIST_VERSION=4.9.2 -GCC_PKGNAME= gcc-mips-${GCC_DIST_VERSION} +GCC_DIST_VERSION= 4.9.2 +GCC_PKGNAME= gcc-mips-${GCC_DIST_VERSION} DISTNAME= gcc-${GCC_DIST_VERSION} PKGNAME= ${GCC_PKGNAME} @@ -64,7 +64,7 @@ CONFIGURE_ARGS+= --with-${prg}=${PREFIX}/bin/${TARGET}-${prg} CONFIGURE_ARGS+= --disable-nls CONFIGURE_ARGS+= --disable-libquadmath -CONFIGURE_ARGS+= --disable-libquadmath-support +CONFIGURE_ARGS+= --disable-libquadmath-support CONFIGURE_ARGS+= --disable-libssp CONFIGURE_ARGS+= --disable-libgomp CONFIGURE_ARGS+= --disable-libstdc++-v3 @@ -73,10 +73,11 @@ CONFIGURE_ARGS+= --disable-libgcc CONFIGURE_ARGS+= --enable-languages=${LANGS:Q} CONFIGURE_ARGS+= --enable-shared CONFIGURE_ARGS+= --enable-long-long -CONFIGURE_ARGS+= --with-local-prefix=${PREFIX:Q} +CONFIGURE_ARGS+= --with-local-prefix=${PREFIX} CONFIGURE_ARGS+= --enable-threads=posix -CONFIGURE_ARGS+= --with-boot-ldflags=${BOOT_LDFLAGS:Q} -MAKE_ENV.NetBSD+= ac_cv_func_clock_gettime=yes +CONFIGURE_ARGS+= --with-boot-ldflags=${BOOT_LDFLAGS:M*:Q} + +MAKE_ENV.NetBSD+= ac_cv_func_clock_gettime=yes CONFIGURE_ARGS.DragonFly+= --disable-bootstrap TARGET= mipsel--netbsd diff --git a/cross/h8300-elf-gcc/Makefile b/cross/h8300-elf-gcc/Makefile index ea2d13622c3..9da52d65dcd 100644 --- a/cross/h8300-elf-gcc/Makefile +++ b/cross/h8300-elf-gcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2019/03/22 13:16:33 tnn Exp $ +# $NetBSD: Makefile,v 1.7 2019/06/08 10:53:28 rillig Exp $ DISTNAME= gcc-6.2.0 PKGNAME= cross-h8300-elf-${DISTNAME} @@ -22,7 +22,7 @@ DEPENDS+= cross-h8300-elf-binutils-[0-9]*:../../cross/h8300-elf-binutils # To avoid an internal compiler error of a library for h8300h # on NetBSD/amd64 7.99.39 (GCC 5.4) .if ${OPSYS} == "NetBSD" -GCC_REQD+= 6.2 +GCC_REQD+= 6 .endif USE_LANGUAGES= c c++03 diff --git a/cross/h8300-hms-binutils/Makefile b/cross/h8300-hms-binutils/Makefile index 89d766f7a2f..2933664bc96 100644 --- a/cross/h8300-hms-binutils/Makefile +++ b/cross/h8300-hms-binutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2013/04/06 20:27:17 rodent Exp $ +# $NetBSD: Makefile,v 1.23 2019/06/08 10:53:28 rillig Exp $ DISTNAME= binutils-2.12.1 PKGNAME= cross-h8300-hms-binutils-2.12.1 @@ -22,7 +22,7 @@ CONFIGURE_ARGS+= --infodir=${H8300_PREFIX}/binutils --target=h8300-hms CONFIGURE_SCRIPT= ${SRCDIR}/configure SRCDIR= ${WRKDIR}/${DISTNAME} BUILD_TARGET= CFLAGS="-O2 -fomit-frame-pointer" all -INFO_FILES= yes +INFO_FILES= yes INSTALLATION_DIRS+= bin ${H8300_PREFIX} diff --git a/cross/h8300-hms-gcc/Makefile b/cross/h8300-hms-gcc/Makefile index cf9b2fb87d2..0343a658470 100644 --- a/cross/h8300-hms-gcc/Makefile +++ b/cross/h8300-hms-gcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2019/03/22 13:16:33 tnn Exp $ +# $NetBSD: Makefile,v 1.31 2019/06/08 10:53:28 rillig Exp $ DISTNAME= gcc-core-3.1 PKGNAME= cross-h8300-hms-gcc-3.1 @@ -10,9 +10,9 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ newlib-1.10.0.tar.gz SITES.newlib-1.10.0.tar.gz= https://www.sourceware.org/pub/newlib/ -PATCH_SITES= ${MASTER_SITE_SOURCEFORGE:=h8300-hms/} -PATCHFILES= h8300-hms-gcc-3.1-1.patch -PATCH_DIST_ARGS= -d ${SRCDIR} -E -p1 +PATCH_SITES= ${MASTER_SITE_SOURCEFORGE:=h8300-hms/} +PATCHFILES= h8300-hms-gcc-3.1-1.patch +PATCH_DIST_ARGS= -d ${SRCDIR} -E -p1 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= #empty @@ -20,7 +20,7 @@ COMMENT= GCC compiler for h8300-hms DEPENDS+= cross-h8300-hms-binutils-[0-9]*:../../cross/h8300-hms-binutils -H8300_PREFIX= ${LOCALBASE}/libexec/cross-h8300-hms +H8300_PREFIX= ${PREFIX}/libexec/cross-h8300-hms WRKSRC= ${WRKDIR}/objdir USE_TOOLS+= gmake diff --git a/cross/mingw-w64-x86_64-gcc-bootstrap/Makefile.common b/cross/mingw-w64-x86_64-gcc-bootstrap/Makefile.common index 130ba4bf087..6ee1e7d8c52 100644 --- a/cross/mingw-w64-x86_64-gcc-bootstrap/Makefile.common +++ b/cross/mingw-w64-x86_64-gcc-bootstrap/Makefile.common @@ -1,5 +1,7 @@ -# $NetBSD: Makefile.common,v 1.3 2019/05/10 19:30:04 ryoon Exp $ +# $NetBSD: Makefile.common,v 1.4 2019/06/08 10:53:28 rillig Exp $ # +# used by cross/mingw-w64-x86_64-gcc-bootstrap/Makefile +# used by cross/mingw-w64-i686-gcc-bootstrap/Makefile # used by cross/mingw-w64-i686-gcc-bootstrap/Makefile.common # used by cross/mingw-w64-x86_64-gcc-bootstrap/Makefile.common diff --git a/cross/mingw-w64-x86_64-headers/Makefile.common b/cross/mingw-w64-x86_64-headers/Makefile.common index 3ff548b6b5e..bd75e347926 100644 --- a/cross/mingw-w64-x86_64-headers/Makefile.common +++ b/cross/mingw-w64-x86_64-headers/Makefile.common @@ -1,5 +1,7 @@ -# $NetBSD: Makefile.common,v 1.3 2019/05/10 19:30:04 ryoon Exp $ +# $NetBSD: Makefile.common,v 1.4 2019/06/08 10:53:28 rillig Exp $ # +# used by cross/mingw-w64-x86_64-headers/Makefile +# used by cross/mingw-w64-i686-headers/Makefile # used by cross/mingw-w64-i686-headers/Makefile.common # used by cross/mingw-w64-x86_64-headers/Makefile.common diff --git a/cross/mingw-w64-x86_64-headers/buildlink3.mk b/cross/mingw-w64-x86_64-headers/buildlink3.mk index 8318efc88ef..c07766f6b78 100644 --- a/cross/mingw-w64-x86_64-headers/buildlink3.mk +++ b/cross/mingw-w64-x86_64-headers/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2018/06/07 19:14:46 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2019/06/08 10:53:28 rillig Exp $ BUILDLINK_TREE+= mingw-w64-x86_64-headers @@ -6,7 +6,7 @@ BUILDLINK_TREE+= mingw-w64-x86_64-headers MINGW_W64_X86_64_HEADERS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.mingw-w64-x86_64-headers+= mingw-w64-x86_64-headers>=5.0.4 -BUILDLINK_PKGSRCDIR.mingw-w64-x86_64-headers?= ../../cross/mingw-w64-x86_64-headers +BUILDLINK_PKGSRCDIR.mingw-w64-x86_64-headers?= ../../cross/mingw-w64-x86_64-headers .endif # MINGW_W64_X86_64_HEADERS_BUILDLINK3_MK BUILDLINK_TREE+= -mingw-w64-x86_64-headers diff --git a/cross/mingw/Makefile.common b/cross/mingw/Makefile.common index 13d078a3347..946da214a39 100644 --- a/cross/mingw/Makefile.common +++ b/cross/mingw/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.3 2016/06/19 16:20:27 wiz Exp $ +# $NetBSD: Makefile.common,v 1.4 2019/06/08 10:53:28 rillig Exp $ # # used by cross/mingw-gcc/buildlink3.mk # used by cross/mingw-binutils/Makefile @@ -17,11 +17,11 @@ CONFIGURE_ENV+= MINGW_TARGET=${MINGW_TARGET:Q} PREPEND_PATH+= ${PREFIX}/cross/bin -.if defined(GNU_CONFIGURE) +. if defined(GNU_CONFIGURE) GNU_CONFIGURE_PREFIX= ${PREFIX}/cross CONFIGURE_ARGS+= --target=${MINGW_TARGET:Q} # following line to avoid getting # make: exec(i386--netbsdelf-ar) failed (No such file or directory) USE_GNU_CONFIGURE_HOST= NO -.endif +. endif .endif diff --git a/cross/nios2-binutils/options.mk b/cross/nios2-binutils/options.mk index d971cea8d86..d73e7a9bfe9 100644 --- a/cross/nios2-binutils/options.mk +++ b/cross/nios2-binutils/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.1 2013/12/03 02:34:52 mef Exp $ +# $NetBSD: options.mk,v 1.2 2019/06/08 10:53:28 rillig Exp $ ### Set options -PKG_OPTIONS_VAR= PKG_OPTIONS.nios2-binutils -PKG_SUPPORTED_OPTIONS= sysroot -PKG_SUGGESTED_OPTIONS= sysroot +PKG_OPTIONS_VAR= PKG_OPTIONS.nios2-binutils +PKG_SUPPORTED_OPTIONS= sysroot +PKG_SUGGESTED_OPTIONS= sysroot .include "../../mk/bsd.options.mk" diff --git a/cross/nios2-gcc/Makefile b/cross/nios2-gcc/Makefile index 75d955e3eb1..1241dd2307e 100644 --- a/cross/nios2-gcc/Makefile +++ b/cross/nios2-gcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2018/08/22 09:43:10 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2019/06/08 10:53:29 rillig Exp $ .include "../../cross/nios2/Makefile.common" PKGNAME= nios2-gcc-${PKG_VERSION} PKG_VERSION= 4.7.3 @@ -17,7 +17,7 @@ USE_GNU_CONFIGURE_HOST= no WRKSRC= ${WRKDIR}/gcc-nios2 # libcpp wants to directly grep in the output -OVERRIDE_DIRDEPTH.depcomp= -1 +OVERRIDE_DIRDEPTH.depcomp= -1 CONFIGURE_ARGS+= --enable-languages=c #CONFIGURE_ARGS+= --disable-multilib @@ -37,7 +37,7 @@ PLIST_VARS+= doc SUBST_CLASSES+= host-subdir # Work around for the problem # gmake[2]: *** No rule to make target `../.././gcc/libgcc.mvars'. Stop. -SUBST_MESSAGE.host-subdir= Purely work-around, replacing @host-subdir@ in advance +SUBST_MESSAGE.host-subdir= Purely work-around, replacing @host-subdir@ in advance SUBST_STAGE.host-subdir= pre-configure SUBST_FILES.host-subdir= libgcc/Makefile.in SUBST_SED.host-subdir= '-e /host_subdir = @host_subdir@/s,@host_subdir@,host-${MACHINE_ARCH}--${OPSYS:tl},' diff --git a/cross/nios2-gcc/distinfo b/cross/nios2-gcc/distinfo index 48f08aae977..446e8a513d2 100644 --- a/cross/nios2-gcc/distinfo +++ b/cross/nios2-gcc/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.5 2015/11/03 00:47:45 agc Exp $ +$NetBSD: distinfo,v 1.6 2019/06/08 10:53:29 rillig Exp $ SHA1 (sourceryg++-2013.05-43-nios2-linux-gnu.src.tar.bz2) = 94a0dadc4c1370dadfacf4bc6cac591e3e47959b RMD160 (sourceryg++-2013.05-43-nios2-linux-gnu.src.tar.bz2) = de056d240a73236d6d8be4851813d8b15d16808f SHA512 (sourceryg++-2013.05-43-nios2-linux-gnu.src.tar.bz2) = 1577ed24d5dfe7436a3f96ef8b906459578777f73a0a07aacc97a87708999a72a0eb0b2ce54306de55e43ce9f1e2dc171f06e7256f59b272af399fb1d29b943b Size (sourceryg++-2013.05-43-nios2-linux-gnu.src.tar.bz2) = 251136787 bytes -SHA1 (patch-aa) = a5c69ac3c3768c90d70665a308a155c584b68e60 +SHA1 (patch-aa) = 849a0ea918f0a1aee5d1c6cd5b6eba4bbb8beb7f SHA1 (patch-gcc_doc_invoke.texi) = 649bc208f3c516263888d5431dc9cba890f53498 SHA1 (patch-libiberty_Makefile.in) = 3ccf5055f59b6420a698c0230a65ec37f78ea8e1 diff --git a/cross/nios2-gcc/options.mk b/cross/nios2-gcc/options.mk index 8ce12e3b538..b47cf592ecc 100644 --- a/cross/nios2-gcc/options.mk +++ b/cross/nios2-gcc/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.1 2013/11/18 06:41:27 mef Exp $ +# $NetBSD: options.mk,v 1.2 2019/06/08 10:53:29 rillig Exp $ ### Set options -PKG_OPTIONS_VAR= PKG_OPTIONS.nios2-gcc -PKG_SUPPORTED_OPTIONS= doc +PKG_OPTIONS_VAR= PKG_OPTIONS.nios2-gcc +PKG_SUPPORTED_OPTIONS= doc PKG_SUGGESTED_OPTIONS= .include "../../mk/bsd.options.mk" diff --git a/cross/nios2-gcc/patches/patch-aa b/cross/nios2-gcc/patches/patch-aa index fafe4344dc1..f775e22957b 100644 --- a/cross/nios2-gcc/patches/patch-aa +++ b/cross/nios2-gcc/patches/patch-aa @@ -1,4 +1,5 @@ -$NetBSD: patch-aa,v 1.3 2013/11/18 06:41:27 mef Exp $ +$NetBSD: patch-aa,v 1.4 2019/06/08 10:53:29 rillig Exp $ + # # (1) craft FPBIT_FUNCS and DPBIT_FUNCS lists to avoid routine collision # against NetBSD softfloat implementation. Following twelve are to diff --git a/cross/nios2-gcc3/Makefile b/cross/nios2-gcc3/Makefile index 98d17058b5c..e68b3edbd97 100644 --- a/cross/nios2-gcc3/Makefile +++ b/cross/nios2-gcc3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2018/08/22 09:43:10 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2019/06/08 10:53:29 rillig Exp $ PKG_VERSION= 3.4.6 # PKGNAME will have option name only when explictly selected @@ -38,7 +38,7 @@ CONFIGURE_ARGS= # reset CONFIGURE_ARGS+= --target=${NIOS2_TARGET:Q} # following line to avoid getting # make: exec(nios2--netbsdelf-ar) failed (No such file or directory) -USE_GNU_CONFIGURE_HOST= NO +USE_GNU_CONFIGURE_HOST= NO .endif CONFIGURE_ARGS+= --enable-languages=c CONFIGURE_ARGS+= --disable-multilib diff --git a/cross/nios2-gcc3/distinfo b/cross/nios2-gcc3/distinfo index 0a31265751e..bb07d8da8bf 100644 --- a/cross/nios2-gcc3/distinfo +++ b/cross/nios2-gcc3/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.2 2015/11/03 00:47:45 agc Exp $ +$NetBSD: distinfo,v 1.3 2019/06/08 10:53:29 rillig Exp $ SHA1 (nios2_gnu_gcc3_10.0.tar.gz) = db28844deb79c416d2ded7fafa9b497ff4fa355c RMD160 (nios2_gnu_gcc3_10.0.tar.gz) = 67f8d48eb49366154efb3fb9c177a978a7768ce5 SHA512 (nios2_gnu_gcc3_10.0.tar.gz) = ba93b9808e4ef637b7d35e4d0cbdcb6619777c0e5fda6cd834b96b20eccdb8d34b0edb52789dafb84eabec7b091cdd7fdbc26dc4a8f56f11597f7aba1ec32f06 Size (nios2_gnu_gcc3_10.0.tar.gz) = 87391346 bytes -SHA1 (patch-aa) = 33c61a420b37b81e85f5d9a4f4962f4ad03b41ea +SHA1 (patch-aa) = 30f4bfb8b42d61467168f062d213ad2e82d1b530 SHA1 (patch-ab) = 92c3ae871f7772553c66145cf606bcfcef4ea64d diff --git a/cross/nios2-gcc3/patches/patch-aa b/cross/nios2-gcc3/patches/patch-aa index 78656f50c68..1a7792dacb0 100644 --- a/cross/nios2-gcc3/patches/patch-aa +++ b/cross/nios2-gcc3/patches/patch-aa @@ -1,4 +1,5 @@ -$NetBSD: patch-aa,v 1.1 2013/11/16 07:41:00 mef Exp $ +$NetBSD: patch-aa,v 1.2 2019/06/08 10:53:29 rillig Exp $ + # # craft FPBIT_FUNCS and DPBIT_FUNCS lists to avoid routine collision # against NetBSD softfloat implementation. Following twelve are to diff --git a/cross/nios2-gcc41/Makefile b/cross/nios2-gcc41/Makefile index 6db1d8ccd38..10a267700f0 100644 --- a/cross/nios2-gcc41/Makefile +++ b/cross/nios2-gcc41/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2018/08/22 09:43:11 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2019/06/08 10:53:29 rillig Exp $ DISTNAME= nios2_gnu_gcc4_13.0 PKG_VERSION= 4.1.2 @@ -19,12 +19,12 @@ GNU_CONFIGURE= yes INFO_FILES= no EXTRACT_ELEMENTS= gcc-4.1 WRKSRC= ${WRKDIR}/${EXTRACT_ELEMENTS} -PATH:= ${PREFIX}/cross/bin:${PATH} +PATH:= ${PREFIX}/cross/bin:${PATH} GNU_CONFIGURE_PREFIX= ${PREFIX}/cross USE_TOOLS+= gmake makeinfo perl bison tar # following line to avoid getting # make: exec(nios2--netbsdelf-ar) failed (No such file or directory) -USE_GNU_CONFIGURE_HOST= NO +USE_GNU_CONFIGURE_HOST= NO NIOS2_TARGET?= nios2-elf diff --git a/cross/nios2-gcc41/distinfo b/cross/nios2-gcc41/distinfo index bdba1b04b62..e9dc7e57932 100644 --- a/cross/nios2-gcc41/distinfo +++ b/cross/nios2-gcc41/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.3 2015/11/03 00:47:45 agc Exp $ +$NetBSD: distinfo,v 1.4 2019/06/08 10:53:29 rillig Exp $ SHA1 (nios2_gnu_gcc4_13.0.gz) = 1df8e0ebd1f0e42ab4dd8a507c0a3dc85c1d598b RMD160 (nios2_gnu_gcc4_13.0.gz) = 5331366fc1ab307909bbe6a2ef1fc11d70b0f523 SHA512 (nios2_gnu_gcc4_13.0.gz) = b6d370bfa801c6be5cdb3be4664b126816a60c08460fadc3ce525affc3ad08ec9cc0a042e25973ff857fe0c49a013401b166bf90a4602dea927fb7bc8a502625 Size (nios2_gnu_gcc4_13.0.gz) = 110799088 bytes -SHA1 (patch-aa) = 9fca3d2c8304c37a091200ffd7abfd4714297c45 +SHA1 (patch-aa) = d0e4b6b0073cf673659a2abd89a5922f6ad7a431 SHA1 (patch-gcc_config_nios2_nios2-proto.h) = 8d3006b98fe47a825c45e15e8b218f5179e8e663 SHA1 (patch-gcc_config_nios2_nios2.c) = bc5655083a1bb641e1b606b547a27903900252fd SHA1 (patch-gcc_doc_invoke.texi) = 75bc85c7713d0579ec960c3f777484ca7d555214 diff --git a/cross/nios2-gcc41/patches/patch-aa b/cross/nios2-gcc41/patches/patch-aa index 11187891148..acf0a1b1619 100644 --- a/cross/nios2-gcc41/patches/patch-aa +++ b/cross/nios2-gcc41/patches/patch-aa @@ -1,4 +1,5 @@ -$NetBSD: patch-aa,v 1.1 2013/11/16 07:41:00 mef Exp $ +$NetBSD: patch-aa,v 1.2 2019/06/08 10:53:29 rillig Exp $ + # # (1) craft FPBIT_FUNCS and DPBIT_FUNCS lists to avoid routine collision # against NetBSD softfloat implementation. Following twelve are to diff --git a/cross/objconv/Makefile b/cross/objconv/Makefile index 74bb4edd705..20200a485dc 100644 --- a/cross/objconv/Makefile +++ b/cross/objconv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2018/06/28 09:02:14 jperkin Exp $ +# $NetBSD: Makefile,v 1.5 2019/06/08 10:53:29 rillig Exp $ # # The upstream distfile is unversioned and replaced every time a new version # is released, so we must put a copy of it up in LOCAL_PORTS with DIST_SUBDIR @@ -27,7 +27,7 @@ INSTALLATION_DIRS+= bin .include "../../mk/endian.mk" .if ${MACHINE_ENDIAN} == "big" -BROKEN= "Does not support big endian systems" +BROKEN= "Does not support big endian systems" .endif post-extract: diff --git a/cross/pdp11-aout-gcc/Makefile b/cross/pdp11-aout-gcc/Makefile index 7e5b131f77b..ba50562d31c 100644 --- a/cross/pdp11-aout-gcc/Makefile +++ b/cross/pdp11-aout-gcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2018/08/22 09:43:11 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2019/06/08 10:53:29 rillig Exp $ DISTNAME= gcc-8.2.0 PKGNAME= cross-pdp11-aout-${DISTNAME} @@ -14,7 +14,7 @@ COMMENT= GCC for PDP-11 aout # for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=33549 # use makeinfo from pkgsrc/devel/gtexinfo. TOOL_DEPENDS+= gtexinfo>=5.1:../../devel/gtexinfo -_TOOLS_USE_PKGSRC.makeinfo=yes +_TOOLS_USE_PKGSRC.makeinfo= yes DEPENDS+= cross-pdp11-aout-binutils-[0-9]*:../../cross/pdp11-aout-binutils diff --git a/cross/xtensa-esp32-elf-gcc/Makefile b/cross/xtensa-esp32-elf-gcc/Makefile index 999eb4ebeb1..a914839cafd 100644 --- a/cross/xtensa-esp32-elf-gcc/Makefile +++ b/cross/xtensa-esp32-elf-gcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2019/05/27 17:31:14 tnn Exp $ +# $NetBSD: Makefile,v 1.3 2019/06/08 10:53:29 rillig Exp $ # We could use the upstream GCC distfile, but Espressif has important vendor # patches in their branch and it seems not worth the maintenance overhead to @@ -18,11 +18,13 @@ GITHUB_TAG= 35d9a8eb86910a6acac7579f22f8e88a92dbb251 # Espressif overlays DISTFILES= ${DEFAULT_DISTFILES} DISTFILES+= crosstool-ng-esp32-2019r1.tar.gz -SITES.crosstool-ng-esp32-2019r1.tar.gz= -https://github.com/espressif/crosstool-NG/archive/ce035ad3351127e4fdb3ff96790caba42b9f1aa3.tar.gz +SITES.crosstool-ng-esp32-2019r1.tar.gz= \ + -https://github.com/espressif/crosstool-NG/archive/ce035ad3351127e4fdb3ff96790caba42b9f1aa3.tar.gz # Custom ESP32 newlib DISTFILES+= newlib-${NEWLIBVER}.tar.gz NEWLIBVER= esp32-2019r1_newlib-3_0_0 -SITES.newlib-${NEWLIBVER}.tar.gz= -https://github.com/espressif/newlib-esp32/archive/46a44cc1111687d8297e35f9766493abd291e5cc.tar.gz +SITES.newlib-${NEWLIBVER}.tar.gz= \ + -https://github.com/espressif/newlib-esp32/archive/46a44cc1111687d8297e35f9766493abd291e5cc.tar.gz MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://github.com/espressif/gcc @@ -39,7 +41,7 @@ USE_TOOLS+= bash gmake makeinfo perl # for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=33549 # use makeinfo from pkgsrc/devel/gtexinfo. TOOL_DEPENDS+= gtexinfo>=5.1:../../devel/gtexinfo -_TOOLS_USE_PKGSRC.makeinfo=yes +_TOOLS_USE_PKGSRC.makeinfo= yes OBJDIR= ../build CONFIGURE_DIRS= ${OBJDIR} |