CVS commit: pkgsrc/cross/mingw-binutils

["Darrin B. Jewell" <dbj%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dbj
Date:           Mon Dec 14 00:39:33 UTC 2020

Modified Files:
        pkgsrc/cross/mingw-binutils: distinfo
Added Files:
        pkgsrc/cross/mingw-binutils/patches: patch-ld_genscripts.sh
Removed Files:
        pkgsrc/cross/mingw-binutils/patches: patch-aa

Log Message:
cross/mingw-binutils: take upstream fix to avoid BASH_LINENO

https://sourceware.org/bugzilla/show_bug.cgi?id=5652


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/cross/mingw-binutils/distinfo
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/cross/mingw-binutils/patches/patch-aa
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/cross/mingw-binutils/patches/patch-ld_genscripts.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/cross/mingw-binutils/distinfo
diff -u pkgsrc/cross/mingw-binutils/distinfo:1.4 pkgsrc/cross/mingw-binutils/distinfo:1.5
--- pkgsrc/cross/mingw-binutils/distinfo:1.4    Tue Nov  3 00:47:44 2015
+++ pkgsrc/cross/mingw-binutils/distinfo        Mon Dec 14 00:39:33 2020
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 00:47:44 agc Exp $
+$NetBSD: distinfo,v 1.5 2020/12/14 00:39:33 dbj Exp $
 
 SHA1 (binutils-2.18.tar.bz2) = fdec92e9dfc6c32155869f3910f47041c78e2277
 RMD160 (binutils-2.18.tar.bz2) = 78d07475667c55ecbf9068dbb90362a3445b2a99
 SHA512 (binutils-2.18.tar.bz2) = d3415f867451eca10d8e0585a64c3bfe2bac6a9f74ca8640c97e284d173cfacf2409179e133e24b77d634adf48e3d218d3585af430085aeda0086afd2066a417
 Size (binutils-2.18.tar.bz2) = 14962245 bytes
-SHA1 (patch-aa) = d0eaca0996d6bc4858230e7c22a26d83336b6370
 SHA1 (patch-ab) = 848b71c900463445d8f5420b3175fd74cf5ae4d9
+SHA1 (patch-ld_genscripts.sh) = 3edb0d9ac26fdca2a31cb2497ad0f61d56cc1ccf

Added files:

Index: pkgsrc/cross/mingw-binutils/patches/patch-ld_genscripts.sh
diff -u /dev/null pkgsrc/cross/mingw-binutils/patches/patch-ld_genscripts.sh:1.1
--- /dev/null   Mon Dec 14 00:39:33 2020
+++ pkgsrc/cross/mingw-binutils/patches/patch-ld_genscripts.sh  Mon Dec 14 00:39:33 2020
@@ -0,0 +1,23 @@
+$NetBSD: patch-ld_genscripts.sh,v 1.1 2020/12/14 00:39:33 dbj Exp $
+
+https://sourceware.org/bugzilla/show_bug.cgi?id=5652
+
+--- ld/genscripts.sh.orig      2007-08-12 19:00:07.000000000 +0000
++++ ld/genscripts.sh
+@@ -390,7 +390,15 @@ case " $EMULATION_LIBPATH " in
+     *" ${EMULATION_NAME} "*) COMPILE_IN=true;;
+ esac
+ 
+-if test -n "${BASH+set}"; then
++# Determine if the shell has support for the variable BASH_LINENO.
++# When it is the case, it is only available inside functions.
++has_lineno()
++{
++  test "x$BASH_LINENO" != "x"
++}
++
++# Enable accruate error source in the compiler error messages, if possible.
++if has_lineno; then
+   source_em()
+   {
+     local current_script="$em_script"