Received: by mail.netbsd.org (Postfix, from userid 605) id 3D5A184D61; Sat, 23 May 2020 20:33:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id BB0C984D53 for ; Sat, 23 May 2020 20:33:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id hzj7LHbX-xdr for ; Sat, 23 May 2020 20:33:52 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 3E33284C6C for ; Sat, 23 May 2020 20:33:52 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 3B604F9A1; Sat, 23 May 2020 20:33:52 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1590266032115980" MIME-Version: 1.0 Date: Sat, 23 May 2020 20:33:52 +0000 From: "Roland Illig" Subject: CVS commit: pkgsrc/lang/ocaml To: pkgsrc-changes@NetBSD.org Reply-To: rillig@netbsd.org X-Mailer: log_accum Message-Id: <20200523203352.3B604F9A1@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1590266032115980 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: rillig Date: Sat May 23 20:33:52 UTC 2020 Modified Files: pkgsrc/lang/ocaml: distinfo Added Files: pkgsrc/lang/ocaml/patches: patch-check-linker-version_sh Log Message: lang/ocaml: fix bashisms in tests To generate a diff of this commit: cvs rdiff -u -r1.135 -r1.136 pkgsrc/lang/ocaml/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/lang/ocaml/patches/patch-check-linker-version_sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1590266032115980 Content-Disposition: inline Content-Length: 2131 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/ocaml/distinfo diff -u pkgsrc/lang/ocaml/distinfo:1.135 pkgsrc/lang/ocaml/distinfo:1.136 --- pkgsrc/lang/ocaml/distinfo:1.135 Wed Apr 15 09:50:54 2020 +++ pkgsrc/lang/ocaml/distinfo Sat May 23 20:33:51 2020 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.135 2020/04/15 09:50:54 jaapb Exp $ +$NetBSD: distinfo,v 1.136 2020/05/23 20:33:51 rillig Exp $ SHA1 (ocaml-4.09.1.tar.gz) = b4e7140e977c0fae5182074dd93b3c1b74f49ee7 RMD160 (ocaml-4.09.1.tar.gz) = 377e956327bac18a37f9e77b2558e9474fd07481 @@ -8,6 +8,7 @@ SHA1 (patch-Makefile) = 132a1cf1187dc05e SHA1 (patch-Makefile.common.in) = fbf3dc0614073ed5ac9b220211a837f69a4ffcaf SHA1 (patch-asmcomp_amd64_emit.mlp) = c2b90f50bc3c4bf9817916bdd455a8bfc03cb69b SHA1 (patch-asmrun_amd64.S) = d4c33cb14c107ed03bf6a3704bbfe7c2799a048e +SHA1 (patch-check-linker-version_sh) = c90242556207242ac58499d7f42519a10aedcca4 SHA1 (patch-configure) = 311b18383bcc88f2a67d83d4b0c6e35344bd2d0d SHA1 (patch-lex_Makefile) = 18d1b8272ffb3e3a58c26d8a2494aaae6942426a SHA1 (patch-man_Makefile) = b780c026aef5f7e6b22b142fce3ec87ef9d2ab22 Added files: Index: pkgsrc/lang/ocaml/patches/patch-check-linker-version_sh diff -u /dev/null pkgsrc/lang/ocaml/patches/patch-check-linker-version_sh:1.1 --- /dev/null Sat May 23 20:33:52 2020 +++ pkgsrc/lang/ocaml/patches/patch-check-linker-version_sh Sat May 23 20:33:52 2020 @@ -0,0 +1,19 @@ +$NetBSD: patch-check-linker-version_sh,v 1.1 2020/05/23 20:33:52 rillig Exp $ + +Fix bashisms. + +--- testsuite/tests/unwind/check-linker-version.sh.orig 2020-03-18 15:02:03.000000000 +0000 ++++ testsuite/tests/unwind/check-linker-version.sh 2020-05-02 15:40:01.333410019 +0000 +@@ -3,10 +3,10 @@ + LDFULL="`ld -v 2>&1`" + LD="`echo $LDFULL | grep -o \"ld64-[0-9]*\"`" + LDVER="`echo $LD | sed \"s/ld64-//\"`" +-if [[ -z "$LD" ]]; then ++if [ -z "$LD" ]; then + echo "unknown linker: pattern ld64-[0-9]* not found in 'ld -v' output"; + test_result=${TEST_SKIP}; +-elif [[ $LDVER -lt 224 ]]; then ++elif [ $LDVER -lt 224 ]; then + echo "ld version is $LDVER, only 224 or above are supported"; + test_result=${TEST_SKIP}; + else --_----------=_1590266032115980--