public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/mdds/files/, dev-util/mdds/
Date: Thu, 28 May 2020 17:09:42 +0000 (UTC)	[thread overview]
Message-ID: <1590685741.145fbf100e4f0e9d75f24b08f403dcc43137d2f8.asturm@gentoo> (raw)

commit:     145fbf100e4f0e9d75f24b08f403dcc43137d2f8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 28 16:42:00 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 28 17:09:01 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=145fbf10

dev-util/mdds: Fix bashisms in configure.ac

Reported-by: Matt Whitlock <gentoo <AT> mattwhitlock.name>
Closes: https://bugs.gentoo.org/723094
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-util/mdds/files/mdds-1.6.0-bashism.patch | 75 ++++++++++++++++++++++++++++
 dev-util/mdds/mdds-1.6.0.ebuild              |  5 +-
 2 files changed, 79 insertions(+), 1 deletion(-)

diff --git a/dev-util/mdds/files/mdds-1.6.0-bashism.patch b/dev-util/mdds/files/mdds-1.6.0-bashism.patch
new file mode 100644
index 00000000000..4fa155c653f
--- /dev/null
+++ b/dev-util/mdds/files/mdds-1.6.0-bashism.patch
@@ -0,0 +1,75 @@
+From 65da7c25f4d8204b1379a0afb46d82dc1b263ab0 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 28 May 2020 18:36:07 +0200
+Subject: [PATCH] Fix bashisms in configure.ac
+
+---
+ configure.ac | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 00ab937..2282165 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -32,7 +32,7 @@ AC_ARG_ENABLE(debug-stdcxx,
+ ]
+ ,debug_stdcxx=yes)
+ 
+-AS_IF([test x"$debug_stdcxx" == "xyes"], [
++AS_IF([test x"$debug_stdcxx" = "xyes"], [
+   CXXFLAGS="$CXXFLAGS -D_GLIBCXX_DEBUG"
+ ])
+ 
+@@ -42,7 +42,7 @@ AC_ARG_ENABLE(release-tests,
+ ]
+ ,release_tests=yes)
+ 
+-AS_IF([test x"$release_tests" == "xyes"], [
++AS_IF([test x"$release_tests" = "xyes"], [
+   CXXFLAGS="$CXXFLAGS -DNDEBUG -O2"
+ ])
+ 
+@@ -56,11 +56,11 @@ AC_ARG_ENABLE(loop-unrolling,
+     [enable_loop_unrolling="$enableval"],[enable_loop_unrolling=yes]
+ )
+ 
+-AS_IF([test x"$enable_loop_unrolling" == "xno"], [
++AS_IF([test x"$enable_loop_unrolling" = "xno"], [
+   CXXFLAGS="$CXXFLAGS -DMDDS_LOOP_UNROLLING=0"
+ ])
+ 
+-AS_IF([test x"$enable_gcov" == "xyes"], [
++AS_IF([test x"$enable_gcov" = "xyes"], [
+   CXXFLAGS="$CXXFLAGS --coverage -O0"
+ ])
+ 
+@@ -69,7 +69,7 @@ AC_ARG_ENABLE(openmp,
+     [enable_openmp="$enableval"],[enable_openmp=yes]
+ )
+ 
+-AS_IF([test x"$enable_openmp" == "xyes"], [
++AS_IF([test x"$enable_openmp" = "xyes"], [
+   CXXFLAGS="$CXXFLAGS -fopenmp"
+   LDFLAGS="$LDFLAGS -fopenmp"
+ ])
+@@ -79,7 +79,7 @@ AC_ARG_ENABLE(sanitizer-coverage,
+     [enable_sanitizer_coverage="$enableval"],[enable_sanitizer_coverage=no]
+ )
+ 
+-AS_IF([test x"$enable_sanitizer_coverage" == "xyes"], [
++AS_IF([test x"$enable_sanitizer_coverage" = "xyes"], [
+   CXXFLAGS="$CXXFLAGS -fprofile-instr-generate -fcoverage-mapping -O0"
+ ])
+ 
+@@ -122,7 +122,7 @@ AC_ARG_ENABLE([werror],
+ 	[enable_werror="$enableval"],
+ 	[enable_werror=no]
+ )
+-AS_IF([test x"$enable_werror" == "xyes"], [
++AS_IF([test x"$enable_werror" = "xyes"], [
+ 	CXXFLAGS="$CXXFLAGS -Werror"
+ ])
+ 
+-- 
+2.26.2
+

diff --git a/dev-util/mdds/mdds-1.6.0.ebuild b/dev-util/mdds/mdds-1.6.0.ebuild
index a8ee00cd56b..9364d50feb9 100644
--- a/dev-util/mdds/mdds-1.6.0.ebuild
+++ b/dev-util/mdds/mdds-1.6.0.ebuild
@@ -30,7 +30,10 @@ BDEPEND="
 DEPEND="dev-libs/boost:="
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-1.5.0-buildsystem.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-1.5.0-buildsystem.patch"
+	"${FILESDIR}/${P}-bashism.patch" # bug 723094
+)
 
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp


             reply	other threads:[~2020-05-28 17:09 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-28 17:09 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-10-31 22:40 [gentoo-commits] repo/gentoo:master commit in: dev-util/mdds/files/, dev-util/mdds/ Andreas Sturmlechner
2020-05-31 21:09 Andreas Sturmlechner
2018-11-15 23:12 Andreas Sturmlechner
2018-11-15 23:12 Andreas Sturmlechner
2018-08-29 13:11 Andreas Sturmlechner
2016-07-03 20:27 Andreas Hüttel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1590685741.145fbf100e4f0e9d75f24b08f403dcc43137d2f8.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox