Received: by mail.netbsd.org (Postfix, from userid 605) id 5D1A884DE4; Thu, 6 May 2021 21:15:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 97A2D84DDE for ; Thu, 6 May 2021 21:15:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 8KfEye5OJzzd for ; Thu, 6 May 2021 21:15:39 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 0DD8684CE1 for ; Thu, 6 May 2021 21:15:39 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 074ACFA95; Thu, 6 May 2021 21:15:39 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1620335738203210" MIME-Version: 1.0 Date: Thu, 6 May 2021 21:15:38 +0000 From: "Tobias Nygren" Subject: CVS commit: pkgsrc/devel/openocd To: pkgsrc-changes@NetBSD.org Reply-To: tnn@netbsd.org X-Mailer: log_accum Message-Id: <20210506211539.074ACFA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1620335738203210 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tnn Date: Thu May 6 21:15:38 UTC 2021 Modified Files: pkgsrc/devel/openocd: Makefile distinfo Added Files: pkgsrc/devel/openocd/patches: patch-configure Log Message: openocd: fix build on Linux To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/openocd/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/openocd/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/devel/openocd/patches/patch-configure Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1620335738203210 Content-Disposition: inline Content-Length: 2896 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/openocd/Makefile diff -u pkgsrc/devel/openocd/Makefile:1.7 pkgsrc/devel/openocd/Makefile:1.8 --- pkgsrc/devel/openocd/Makefile:1.7 Thu May 6 15:31:13 2021 +++ pkgsrc/devel/openocd/Makefile Thu May 6 21:15:38 2021 @@ -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 @@ INFO_FILES= yes CONFIGURE_ARGS+= --infodir=${PREFIX}/info CONFIGURE_ARGS+= --disable-internal-jimtcl BUILDLINK_TRANSFORM+= rm:-Werror +OVERRIDE_DIRDEPTH?= 5 .include "options.mk" Index: pkgsrc/devel/openocd/distinfo diff -u pkgsrc/devel/openocd/distinfo:1.8 pkgsrc/devel/openocd/distinfo:1.9 --- pkgsrc/devel/openocd/distinfo:1.8 Thu May 6 15:31:13 2021 +++ pkgsrc/devel/openocd/distinfo Thu May 6 21:15:38 2021 @@ -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 Added files: Index: pkgsrc/devel/openocd/patches/patch-configure diff -u /dev/null pkgsrc/devel/openocd/patches/patch-configure:1.1 --- /dev/null Thu May 6 21:15:38 2021 +++ pkgsrc/devel/openocd/patches/patch-configure Thu May 6 21:15:38 2021 @@ -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" + + + --_----------=_1620335738203210--