From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EE7C715800F for ; Thu, 19 Jan 2023 13:42:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2FF69E0916; Thu, 19 Jan 2023 13:42:54 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 168DCE0916 for ; Thu, 19 Jan 2023 13:42:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F3438340B77 for ; Thu, 19 Jan 2023 13:42:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5081D7FA for ; Thu, 19 Jan 2023 13:42:50 +0000 (UTC) From: "Nicolas Bock" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nicolas Bock" Message-ID: <1674135758.cd55b93e817d7c81a1d4f5290263a664263494ff.nicolasbock@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/charliecloud/files/, sys-cluster/charliecloud/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/charliecloud/charliecloud-0.30.ebuild sys-cluster/charliecloud/files/charliecloud-0.30-dash.patch X-VCS-Directories: sys-cluster/charliecloud/ sys-cluster/charliecloud/files/ X-VCS-Committer: nicolasbock X-VCS-Committer-Name: Nicolas Bock X-VCS-Revision: cd55b93e817d7c81a1d4f5290263a664263494ff X-VCS-Branch: master Date: Thu, 19 Jan 2023 13:42:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 926d6c42-3a96-4025-b738-8a487384f6aa X-Archives-Hash: 173d7e1b6ea267b1701d4e75b54fa5cc commit: cd55b93e817d7c81a1d4f5290263a664263494ff Author: Oliver Freyermuth googlemail com> AuthorDate: Wed Jan 18 19:32:24 2023 +0000 Commit: Nicolas Bock gentoo org> CommitDate: Thu Jan 19 13:42:38 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd55b93e sys-cluster/charliecloud: Fix for dash as system shell. Closes: https://bugs.gentoo.org/890873 Closes: https://github.com/gentoo/gentoo/pull/29161 Signed-off-by: Oliver Freyermuth googlemail.com> Signed-off-by: Nicolas Bock gentoo.org> sys-cluster/charliecloud/charliecloud-0.30.ebuild | 4 ++ .../files/charliecloud-0.30-dash.patch | 48 ++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/sys-cluster/charliecloud/charliecloud-0.30.ebuild b/sys-cluster/charliecloud/charliecloud-0.30.ebuild index db6df71719a9..9ec1de0e9b0a 100644 --- a/sys-cluster/charliecloud/charliecloud-0.30.ebuild +++ b/sys-cluster/charliecloud/charliecloud-0.30.ebuild @@ -48,6 +48,10 @@ DEPEND=" net-misc/rsync )" +PATCHES=( + "${FILESDIR}"/${P}-dash.patch +) + src_prepare() { default eautoreconf diff --git a/sys-cluster/charliecloud/files/charliecloud-0.30-dash.patch b/sys-cluster/charliecloud/files/charliecloud-0.30-dash.patch new file mode 100644 index 000000000000..ba76e3fee59f --- /dev/null +++ b/sys-cluster/charliecloud/files/charliecloud-0.30-dash.patch @@ -0,0 +1,48 @@ +From 1fb019b26d54f777ea7a2781f96adec369a25cbc Mon Sep 17 00:00:00 2001 +From: Oliver Freyermuth +Date: Tue, 17 Jan 2023 19:00:11 +0100 +Subject: [PATCH] PR #1538: configure: Remove bashisms, fix dash compatibility +Bug: https://bugs.gentoo.org/890873 +Bug: https://github.com/hpc/charliecloud/pull/1538 + ++= and |& are not supported by systems using dash as shell. +--- + configure.ac | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 683a532..1c878d7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -216,15 +216,15 @@ AC_PROG_CC + # Set up CFLAGS. + ch_cflags='-std=c99 -Wall' + AS_IF([test -n "$lib_libsquashfuse"], +- [ch_cflags+=" -I$inc_libsquashfuse -L$lib_libsquashfuse" ++ [ch_cflags="$ch_cflags -I$inc_libsquashfuse -L$lib_libsquashfuse" + # Without this, clang fails with "error: argument unused during + # compilation" on the -L. GCC ignores it. +- ch_cflags+=' -Wno-unused-command-line-argument']) ++ ch_cflags="$ch_cflags -Wno-unused-command-line-argument"]) + AS_IF([test $use_werror = yes], +- [ch_cflags+=' -Werror']) ++ [ch_cflags="$ch_cflags -Werror"]) + + AX_CHECK_COMPILE_FLAG([$ch_cflags], [ +- CFLAGS+=" $ch_cflags" ++ CFLAGS="$CFLAGS $ch_cflags" + ], [ + AC_MSG_ERROR([no suitable C99 compiler found]) + ]) +@@ -434,7 +434,7 @@ CH_CHECK_VERSION([GIT], [$vmin_git], [--version | cut -d' ' -f3]) + # DOT + vmin_dot=2.30.1 + AC_CHECK_PROG([DOT], [dot], [dot]) +-CH_CHECK_VERSION([DOT], [$vmin_dot], [dot -V |& cut -d' ' -f5]) ++CH_CHECK_VERSION([DOT], [$vmin_dot], [dot -V 2>&1 | cut -d' ' -f5]) + + # git2dot + vmin_git2dot=0.8.3 +-- +2.38.2 +