pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/cross cross/*: let pkglint autofix indentation and var...
details: https://anonhg.NetBSD.org/pkgsrc/rev/cc7055cf2889
branches: trunk
changeset: 334892:cc7055cf2889
user: rillig <rillig%pkgsrc.org@localhost>
date: Sat Jun 08 10:53:26 2019 +0000
description:
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.
diffstat:
cross/aarch64-none-elf-gcc/Makefile | 8 +-
cross/arm-none-eabi-gdb/Makefile | 4 +-
cross/avr-binutils/buildlink3.mk | 6 +-
cross/avr-binutils/distinfo | 6 +-
cross/avr-binutils/patches/patch-ad | 4 +-
cross/avr-binutils/patches/patch-ah | 3 +-
cross/avr-gdb/Makefile | 4 +-
cross/avr-libc/Makefile | 6 +-
cross/avr-libc/options.mk | 56 ++++++++++----------
cross/avrdude/Makefile | 6 +-
cross/bfd-crunchide/Makefile | 14 ++--
cross/binutils-mips-current/Makefile | 4 +-
cross/bossa/Makefile | 4 +-
cross/cross-binutils/Makefile | 4 +-
cross/dfu-programmer/Makefile | 6 +-
cross/freemint-binutils/Makefile | 6 +-
cross/freemint-cflib/Makefile | 4 +-
cross/freemint-gemlib/Makefile | 4 +-
cross/freemint-ldg/Makefile | 14 ++--
cross/gcc-mips-current/Makefile | 15 ++--
cross/h8300-elf-gcc/Makefile | 4 +-
cross/h8300-hms-binutils/Makefile | 4 +-
cross/h8300-hms-gcc/Makefile | 10 +-
cross/mingw-w64-x86_64-gcc-bootstrap/Makefile.common | 4 +-
cross/mingw-w64-x86_64-headers/Makefile.common | 4 +-
cross/mingw-w64-x86_64-headers/buildlink3.mk | 4 +-
cross/mingw/Makefile.common | 6 +-
cross/nios2-binutils/options.mk | 8 +-
cross/nios2-gcc/Makefile | 6 +-
cross/nios2-gcc/distinfo | 4 +-
cross/nios2-gcc/options.mk | 6 +-
cross/nios2-gcc/patches/patch-aa | 3 +-
cross/nios2-gcc3/Makefile | 4 +-
cross/nios2-gcc3/distinfo | 4 +-
cross/nios2-gcc3/patches/patch-aa | 3 +-
cross/nios2-gcc41/Makefile | 6 +-
cross/nios2-gcc41/distinfo | 4 +-
cross/nios2-gcc41/patches/patch-aa | 3 +-
cross/objconv/Makefile | 4 +-
cross/pdp11-aout-gcc/Makefile | 4 +-
cross/xtensa-esp32-elf-gcc/Makefile | 10 ++-
41 files changed, 147 insertions(+), 136 deletions(-)
diffs (truncated from 846 to 300 lines):
diff -r c165eed8e42a -r cc7055cf2889 cross/aarch64-none-elf-gcc/Makefile
--- a/cross/aarch64-none-elf-gcc/Makefile Sat Jun 08 10:40:52 2019 +0000
+++ b/cross/aarch64-none-elf-gcc/Makefile Sat Jun 08 10:53:26 2019 +0000
@@ -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 @@
# 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 -r c165eed8e42a -r cc7055cf2889 cross/arm-none-eabi-gdb/Makefile
--- a/cross/arm-none-eabi-gdb/Makefile Sat Jun 08 10:40:52 2019 +0000
+++ b/cross/arm-none-eabi-gdb/Makefile Sat Jun 08 10:53:26 2019 +0000
@@ -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 @@
.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 -r c165eed8e42a -r cc7055cf2889 cross/avr-binutils/buildlink3.mk
--- a/cross/avr-binutils/buildlink3.mk Sat Jun 08 10:40:52 2019 +0000
+++ b/cross/avr-binutils/buildlink3.mk Sat Jun 08 10:53:26 2019 +0000
@@ -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 -r c165eed8e42a -r cc7055cf2889 cross/avr-binutils/distinfo
--- a/cross/avr-binutils/distinfo Sat Jun 08 10:40:52 2019 +0000
+++ b/cross/avr-binutils/distinfo Sat Jun 08 10:53:26 2019 +0000
@@ -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 -r c165eed8e42a -r cc7055cf2889 cross/avr-binutils/patches/patch-ad
--- a/cross/avr-binutils/patches/patch-ad Sat Jun 08 10:40:52 2019 +0000
+++ b/cross/avr-binutils/patches/patch-ad Sat Jun 08 10:53:26 2019 +0000
@@ -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 -r c165eed8e42a -r cc7055cf2889 cross/avr-binutils/patches/patch-ah
--- a/cross/avr-binutils/patches/patch-ah Sat Jun 08 10:40:52 2019 +0000
+++ b/cross/avr-binutils/patches/patch-ah Sat Jun 08 10:53:26 2019 +0000
@@ -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 -r c165eed8e42a -r cc7055cf2889 cross/avr-gdb/Makefile
--- a/cross/avr-gdb/Makefile Sat Jun 08 10:40:52 2019 +0000
+++ b/cross/avr-gdb/Makefile Sat Jun 08 10:53:26 2019 +0000
@@ -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 @@
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 -r c165eed8e42a -r cc7055cf2889 cross/avr-libc/Makefile
--- a/cross/avr-libc/Makefile Sat Jun 08 10:40:52 2019 +0000
+++ b/cross/avr-libc/Makefile Sat Jun 08 10:53:26 2019 +0000
@@ -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 @@
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 -r c165eed8e42a -r cc7055cf2889 cross/avr-libc/options.mk
--- a/cross/avr-libc/options.mk Sat Jun 08 10:40:52 2019 +0000
+++ b/cross/avr-libc/options.mk Sat Jun 08 10:53:26 2019 +0000
@@ -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 @@
.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 @@
## 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 -r c165eed8e42a -r cc7055cf2889 cross/avrdude/Makefile
--- a/cross/avrdude/Makefile Sat Jun 08 10:40:52 2019 +0000
+++ b/cross/avrdude/Makefile Sat Jun 08 10:53:26 2019 +0000
@@ -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 @@
# 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 @@
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 -r c165eed8e42a -r cc7055cf2889 cross/bfd-crunchide/Makefile
--- a/cross/bfd-crunchide/Makefile Sat Jun 08 10:40:52 2019 +0000
+++ b/cross/bfd-crunchide/Makefile Sat Jun 08 10:53:26 2019 +0000
@@ -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 @@
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 -r c165eed8e42a -r cc7055cf2889 cross/binutils-mips-current/Makefile
--- a/cross/binutils-mips-current/Makefile Sat Jun 08 10:40:52 2019 +0000
+++ b/cross/binutils-mips-current/Makefile Sat Jun 08 10:53:26 2019 +0000
@@ -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 @@
MAKE_ARGS+= CFLAGS="${CFLAGS}"
-PLIST_SUBST+= LOCALBASE=${LOCALBASE:Q}
+PLIST_SUBST+= LOCALBASE=${PREFIX}
Home |
Main Index |
Thread Index |
Old Index