| 1 |
commit: 69f45f358a48821fdfa0294b602163dbfe68c691 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 28 16:59:00 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 28 17:09:02 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69f45f35 |
| 7 |
|
| 8 |
dev-libs/libixion: Fix bashisms in configure.ac, --disable-static |
| 9 |
|
| 10 |
Reported-by: Matt Whitlock <gentoo <AT> mattwhitlock.name> |
| 11 |
Thanks-to: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 12 |
Closes: https://bugs.gentoo.org/723128 |
| 13 |
Package-Manager: Portage-2.3.100, Repoman-2.3.22 |
| 14 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 15 |
|
| 16 |
.../libixion/files/libixion-0.15.0-bashism.patch | 32 ++++++++++++++++++++++ |
| 17 |
dev-libs/libixion/libixion-0.15.0.ebuild | 15 ++++++---- |
| 18 |
dev-libs/libixion/libixion-9999.ebuild | 4 +-- |
| 19 |
3 files changed, 43 insertions(+), 8 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-libs/libixion/files/libixion-0.15.0-bashism.patch b/dev-libs/libixion/files/libixion-0.15.0-bashism.patch |
| 22 |
new file mode 100644 |
| 23 |
index 00000000000..9df7b04a865 |
| 24 |
--- /dev/null |
| 25 |
+++ b/dev-libs/libixion/files/libixion-0.15.0-bashism.patch |
| 26 |
@@ -0,0 +1,32 @@ |
| 27 |
+From 076f6576e7398842457d34fd68140512795c7e00 Mon Sep 17 00:00:00 2001 |
| 28 |
+From: Lars Wendler <polynomial-c@g.o> |
| 29 |
+Date: Fri, 15 May 2020 12:42:20 +0200 |
| 30 |
+Subject: [PATCH] configure.ac: avoid bashisms |
| 31 |
+ |
| 32 |
+or else we end up with unpredictable results if shell != /bin/bash: |
| 33 |
+ |
| 34 |
+ ./configure: 19427: test: xno: unexpected operator |
| 35 |
+ |
| 36 |
+Reported-by: Matt Whitlock <gentoo@××××××××××××.name> |
| 37 |
+Gentoo-bug: https://bugs.gentoo.org/723128 |
| 38 |
+Signed-off-by: Lars Wendler <polynomial-c@g.o> |
| 39 |
+--- |
| 40 |
+ configure.ac | 2 +- |
| 41 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 42 |
+ |
| 43 |
+diff --git a/configure.ac b/configure.ac |
| 44 |
+index 3a07dd8..505aeba 100644 |
| 45 |
+--- a/configure.ac |
| 46 |
++++ b/configure.ac |
| 47 |
+@@ -182,7 +182,7 @@ AC_ARG_ENABLE([werror], |
| 48 |
+ [enable_werror="$enableval"], |
| 49 |
+ [enable_werror=no] |
| 50 |
+ ) |
| 51 |
+-AS_IF([test x"$enable_werror" == "xyes"], [ |
| 52 |
++AS_IF([test x"$enable_werror" = "xyes"], [ |
| 53 |
+ CXXFLAGS="$CXXFLAGS -Werror" |
| 54 |
+ ]) |
| 55 |
+ |
| 56 |
+-- |
| 57 |
+2.26.2 |
| 58 |
+ |
| 59 |
|
| 60 |
diff --git a/dev-libs/libixion/libixion-0.15.0.ebuild b/dev-libs/libixion/libixion-0.15.0.ebuild |
| 61 |
index d3155185dc5..b93481abbca 100644 |
| 62 |
--- a/dev-libs/libixion/libixion-0.15.0.ebuild |
| 63 |
+++ b/dev-libs/libixion/libixion-0.15.0.ebuild |
| 64 |
@@ -4,14 +4,14 @@ |
| 65 |
EAPI=7 |
| 66 |
|
| 67 |
PYTHON_COMPAT=( python3_{6,7,8} ) |
| 68 |
-inherit python-single-r1 |
| 69 |
+inherit autotools python-single-r1 |
| 70 |
|
| 71 |
DESCRIPTION="General purpose formula parser & interpreter" |
| 72 |
HOMEPAGE="https://gitlab.com/ixion/ixion" |
| 73 |
|
| 74 |
if [[ ${PV} == *9999 ]]; then |
| 75 |
EGIT_REPO_URI="https://gitlab.com/ixion/ixion.git" |
| 76 |
- inherit git-r3 autotools |
| 77 |
+ inherit git-r3 |
| 78 |
else |
| 79 |
SRC_URI="https://kohei.us/files/ixion/src/${P}.tar.xz" |
| 80 |
KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86" |
| 81 |
@@ -19,7 +19,7 @@ fi |
| 82 |
|
| 83 |
LICENSE="MIT" |
| 84 |
SLOT="0/0.15" # based on SONAME of libixion.so |
| 85 |
-IUSE="debug python static-libs +threads" |
| 86 |
+IUSE="debug python +threads" |
| 87 |
|
| 88 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 89 |
|
| 90 |
@@ -32,7 +32,10 @@ DEPEND="${RDEPEND} |
| 91 |
dev-libs/spdlog |
| 92 |
" |
| 93 |
|
| 94 |
-PATCHES=( "${FILESDIR}/${P}-musl-clang.patch" ) # bug 714018 |
| 95 |
+PATCHES=( |
| 96 |
+ "${FILESDIR}/${P}-musl-clang.patch" # bug 714018 |
| 97 |
+ "${FILESDIR}/${P}-bashism.patch" # bug 723128 |
| 98 |
+) |
| 99 |
|
| 100 |
pkg_setup() { |
| 101 |
use python && python-single-r1_pkg_setup |
| 102 |
@@ -40,14 +43,14 @@ pkg_setup() { |
| 103 |
|
| 104 |
src_prepare() { |
| 105 |
default |
| 106 |
- [[ ${PV} == *9999 ]] && eautoreconf |
| 107 |
+ eautoreconf |
| 108 |
} |
| 109 |
|
| 110 |
src_configure() { |
| 111 |
local myeconfargs=( |
| 112 |
+ --disable-static |
| 113 |
$(use_enable debug) |
| 114 |
$(use_enable python) |
| 115 |
- $(use_enable static-libs static) |
| 116 |
$(use_enable threads) |
| 117 |
) |
| 118 |
econf "${myeconfargs[@]}" |
| 119 |
|
| 120 |
diff --git a/dev-libs/libixion/libixion-9999.ebuild b/dev-libs/libixion/libixion-9999.ebuild |
| 121 |
index 28084226f1e..e3b55ff9101 100644 |
| 122 |
--- a/dev-libs/libixion/libixion-9999.ebuild |
| 123 |
+++ b/dev-libs/libixion/libixion-9999.ebuild |
| 124 |
@@ -21,7 +21,7 @@ fi |
| 125 |
|
| 126 |
LICENSE="MIT" |
| 127 |
SLOT="0/0.16" # based on SONAME of libixion.so |
| 128 |
-IUSE="debug python static-libs +threads" |
| 129 |
+IUSE="debug python +threads" |
| 130 |
|
| 131 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 132 |
|
| 133 |
@@ -45,9 +45,9 @@ src_prepare() { |
| 134 |
|
| 135 |
src_configure() { |
| 136 |
local myeconfargs=( |
| 137 |
+ --disable-static |
| 138 |
$(use_enable debug) |
| 139 |
$(use_enable python) |
| 140 |
- $(use_enable static-libs static) |
| 141 |
$(use_enable threads) |
| 142 |
) |
| 143 |
econf "${myeconfargs[@]}" |
Archives