commit: 978a74a61f2ca616c39051f9de4aab1214920bca Author: Kai-Chun Ning <kaichun.ning <AT> gmail <DOT> com> AuthorDate: Sun Mar 5 10:53:54 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Mar 5 11:31:38 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=978a74a6
sci-mathematics/cvc4: fix build with bash 5.2 Closes: https://bugs.gentoo.org/883273 Signed-off-by: Kai-Chun Ning <kaichun.ning <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/29933 Signed-off-by: Sam James <sam <AT> gentoo.org> .../{cvc4-1.8-r3.ebuild => cvc4-1.8-r4.ebuild} | 1 + .../cvc4/files/cvc4-1.8-bash-5.2-fix.patch | 44 ++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/sci-mathematics/cvc4/cvc4-1.8-r3.ebuild b/sci-mathematics/cvc4/cvc4-1.8-r4.ebuild similarity index 97% rename from sci-mathematics/cvc4/cvc4-1.8-r3.ebuild rename to sci-mathematics/cvc4/cvc4-1.8-r4.ebuild index 276bdf289c12..d62729a94aa8 100644 --- a/sci-mathematics/cvc4/cvc4-1.8-r3.ebuild +++ b/sci-mathematics/cvc4/cvc4-1.8-r4.ebuild @@ -33,6 +33,7 @@ S="${WORKDIR}"/${PN^^}-archived-${PV} PATCHES=( "${FILESDIR}"/${P}-gentoo.patch "${FILESDIR}"/${P}-toml.patch + "${FILESDIR}"/${P}-bash-5.2-fix.patch ) python_check_deps() { diff --git a/sci-mathematics/cvc4/files/cvc4-1.8-bash-5.2-fix.patch b/sci-mathematics/cvc4/files/cvc4-1.8-bash-5.2-fix.patch new file mode 100644 index 000000000000..54398da72555 --- /dev/null +++ b/sci-mathematics/cvc4/files/cvc4-1.8-bash-5.2-fix.patch @@ -0,0 +1,44 @@ +Description: Fix FTBFS with bash 5.2 +Author: Jerry James <[email protected]> +Forwarded: no +Last-Update: 2022-10-17 +Bug: https://bugs.gentoo.org/883273 +See: https://salsa.debian.org/science-team/cvc4/-/merge_requests/2/diffs?commit_id=05ca9eee24e279ddfbaebea7393b4303200141ad +--- + +diff --git a/src/expr/mkexpr b/src/expr/mkexpr +index c5f12f487..642a7ff0d 100755 +--- a/src/expr/mkexpr ++++ b/src/expr/mkexpr +@@ -16,6 +16,7 @@ + # + + copyright=2010-2014 ++shopt -u patsub_replacement + + filename=`basename "$1" | sed 's,_template,,'` + +diff --git a/src/expr/mkkind b/src/expr/mkkind +index fbf37eff4..77a8fc7e5 100755 +--- a/src/expr/mkkind ++++ b/src/expr/mkkind +@@ -15,6 +15,7 @@ + # + + copyright=2010-2014 ++shopt -u patsub_replacement + + filename=`basename "$1" | sed 's,_template,,'` + +diff --git a/src/expr/mkmetakind b/src/expr/mkmetakind +index e2a733ec8..935040bed 100755 +--- a/src/expr/mkmetakind ++++ b/src/expr/mkmetakind +@@ -18,6 +18,7 @@ + # + + copyright=2010-2014 ++shopt -u patsub_replacement + + cat <<EOF + /********************* */
