[pkgsrc/trunk]: pkgsrc/devel/openocd openocd: fix build on Linux

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/597afc54aec4
branches:  trunk
changeset: 452213:597afc54aec4
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Thu May 06 21:15:38 2021 +0000

description:
openocd: fix build on Linux

diffstat:

 devel/openocd/Makefile                |   3 ++-
 devel/openocd/distinfo                |   3 ++-
 devel/openocd/patches/patch-configure |  26 ++++++++++++++++++++++++++
 3 files changed, 30 insertions(+), 2 deletions(-)

diffs (61 lines):

diff -r d6cd98de4ce2 -r 597afc54aec4 devel/openocd/Makefile
--- a/devel/openocd/Makefile    Thu May 06 21:00:08 2021 +0000
+++ b/devel/openocd/Makefile    Thu May 06 21:15:38 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2021/05/06 15:31:13 tnn Exp $
+# $NetBSD: Makefile,v 1.8 2021/05/06 21:15:38 tnn Exp $
 
 DISTNAME=      openocd-0.11.0
 CATEGORIES=    devel
@@ -19,6 +19,7 @@
 CONFIGURE_ARGS+=       --infodir=${PREFIX}/info
 CONFIGURE_ARGS+=       --disable-internal-jimtcl
 BUILDLINK_TRANSFORM+=  rm:-Werror
+OVERRIDE_DIRDEPTH?=    5
 
 .include "options.mk"
 
diff -r d6cd98de4ce2 -r 597afc54aec4 devel/openocd/distinfo
--- a/devel/openocd/distinfo    Thu May 06 21:00:08 2021 +0000
+++ b/devel/openocd/distinfo    Thu May 06 21:15:38 2021 +0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.8 2021/05/06 15:31:13 tnn Exp $
+$NetBSD: distinfo,v 1.9 2021/05/06 21:15:38 tnn Exp $
 
 SHA1 (openocd-0.11.0.tar.bz2) = 8d454145a8c22eb9d837ab3ba08dcef06cd10473
 RMD160 (openocd-0.11.0.tar.bz2) = d1e09011ef5e9171529b550b0e90468da178425d
 SHA512 (openocd-0.11.0.tar.bz2) = 4c8d880945083a05a3781b3fe2a39e4055df635faab1cacd78ca51ced75c9a478f4e16e6c6fa35ac117e2e4d6453cdd19818f1d27aae6edf1bda8c0e846d0de8
 Size (openocd-0.11.0.tar.bz2) = 5699972 bytes
 SHA1 (patch-Makefile.in) = 4035163eb0563254dc4f1bc4a0abac9fbea633e1
+SHA1 (patch-configure) = c65287a4a8e298849fbc95550d66f52be88d9954
 SHA1 (patch-src_flash_nor_fm4.c) = b14914ebe08a7c7d9f12c3999c5e6edeae2569e0
diff -r d6cd98de4ce2 -r 597afc54aec4 devel/openocd/patches/patch-configure
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/openocd/patches/patch-configure     Thu May 06 21:15:38 2021 +0000
@@ -0,0 +1,26 @@
+$NetBSD: patch-configure,v 1.1 2021/05/06 21:15:38 tnn Exp $
+
+Fix build on Linux.
+CONFIG_SHELL should ensure that "echo -e" works but for some reason this part
+of the script gets executed with the wrong shell.
+
+--- configure.orig     2021-03-07 11:02:04.000000000 +0000
++++ configure
+@@ -14884,7 +14884,7 @@ if test "x$use_internal_jimtcl" = "xyes"
+ subdirs="$subdirs jimtcl"
+ 
+ 
+-echo -e '#!/bin/sh\nexec "`dirname "'\$'0"`/configure" --disable-install-jim "'\$'@"' > "$srcdir/jimtcl/configure.gnu"
++printf '#!/bin/sh\nexec "`dirname "'\$'0"`/configure" --disable-install-jim "'\$'@"' > "$srcdir/jimtcl/configure.gnu"
+ 
+ 
+ 
+@@ -16703,7 +16703,7 @@ if test "x$enable_jlink" != "xno"; then 
+ subdirs="$subdirs src/jtag/drivers/libjaylink"
+ 
+ 
+-echo -e '#!/bin/sh\nexec "`dirname "'\$'0"`/configure" --enable-subproject-build "'\$'@"' > "$srcdir/src/jtag/drivers/libjaylink/configure.gnu"
++printf '#!/bin/sh\nexec "`dirname "'\$'0"`/configure" --enable-subproject-build "'\$'@"' > "$srcdir/src/jtag/drivers/libjaylink/configure.gnu"
+ 
+ 
+