Thu May 6 21:15:38 2021 UTC ()
openocd: fix build on Linux


(tnn)
diff -r1.7 -r1.8 pkgsrc/devel/openocd/Makefile
diff -r1.8 -r1.9 pkgsrc/devel/openocd/distinfo
diff -r0 -r1.1 pkgsrc/devel/openocd/patches/patch-configure
cvs diff -r1.7 -r1.8 pkgsrc/devel/openocd/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/openocd/Makefile 2021/05/06 15:31:13 1.7
+++ pkgsrc/devel/openocd/Makefile 2021/05/06 21:15:38 1.8
@@ -1,27 +1,28 @@ @@ -1,27 +1,28 @@
1# $NetBSD: Makefile,v 1.7 2021/05/06 15:31:13 tnn Exp $ 1# $NetBSD: Makefile,v 1.8 2021/05/06 21:15:38 tnn Exp $
2 2
3DISTNAME= openocd-0.11.0 3DISTNAME= openocd-0.11.0
4CATEGORIES= devel 4CATEGORIES= devel
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=openocd/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=openocd/}
6EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://openocd.org/ 9HOMEPAGE= http://openocd.org/
10COMMENT= Open On-Chip Debugger 10COMMENT= Open On-Chip Debugger
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
15USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
16USE_TOOLS+= gmake pkg-config 16USE_TOOLS+= gmake pkg-config
17INFO_FILES= yes 17INFO_FILES= yes
18 18
19CONFIGURE_ARGS+= --infodir=${PREFIX}/info 19CONFIGURE_ARGS+= --infodir=${PREFIX}/info
20CONFIGURE_ARGS+= --disable-internal-jimtcl 20CONFIGURE_ARGS+= --disable-internal-jimtcl
21BUILDLINK_TRANSFORM+= rm:-Werror 21BUILDLINK_TRANSFORM+= rm:-Werror
 22OVERRIDE_DIRDEPTH?= 5
22 23
23.include "options.mk" 24.include "options.mk"
24 25
25.include "../../lang/jimtcl/buildlink3.mk" 26.include "../../lang/jimtcl/buildlink3.mk"
26.include "../../mk/dlopen.buildlink3.mk" 27.include "../../mk/dlopen.buildlink3.mk"
27.include "../../mk/bsd.pkg.mk" 28.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/devel/openocd/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/openocd/distinfo 2021/05/06 15:31:13 1.8
+++ pkgsrc/devel/openocd/distinfo 2021/05/06 21:15:38 1.9
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.8 2021/05/06 15:31:13 tnn Exp $ 1$NetBSD: distinfo,v 1.9 2021/05/06 21:15:38 tnn Exp $
2 2
3SHA1 (openocd-0.11.0.tar.bz2) = 8d454145a8c22eb9d837ab3ba08dcef06cd10473 3SHA1 (openocd-0.11.0.tar.bz2) = 8d454145a8c22eb9d837ab3ba08dcef06cd10473
4RMD160 (openocd-0.11.0.tar.bz2) = d1e09011ef5e9171529b550b0e90468da178425d 4RMD160 (openocd-0.11.0.tar.bz2) = d1e09011ef5e9171529b550b0e90468da178425d
5SHA512 (openocd-0.11.0.tar.bz2) = 4c8d880945083a05a3781b3fe2a39e4055df635faab1cacd78ca51ced75c9a478f4e16e6c6fa35ac117e2e4d6453cdd19818f1d27aae6edf1bda8c0e846d0de8 5SHA512 (openocd-0.11.0.tar.bz2) = 4c8d880945083a05a3781b3fe2a39e4055df635faab1cacd78ca51ced75c9a478f4e16e6c6fa35ac117e2e4d6453cdd19818f1d27aae6edf1bda8c0e846d0de8
6Size (openocd-0.11.0.tar.bz2) = 5699972 bytes 6Size (openocd-0.11.0.tar.bz2) = 5699972 bytes
7SHA1 (patch-Makefile.in) = 4035163eb0563254dc4f1bc4a0abac9fbea633e1 7SHA1 (patch-Makefile.in) = 4035163eb0563254dc4f1bc4a0abac9fbea633e1
 8SHA1 (patch-configure) = c65287a4a8e298849fbc95550d66f52be88d9954
8SHA1 (patch-src_flash_nor_fm4.c) = b14914ebe08a7c7d9f12c3999c5e6edeae2569e0 9SHA1 (patch-src_flash_nor_fm4.c) = b14914ebe08a7c7d9f12c3999c5e6edeae2569e0
File Added: pkgsrc/devel/openocd/patches/patch-configure
$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"