| 1 |
commit: d131fa2acad53017e0374759dd5f2f0766ecabeb |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 28 16:52:15 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=d131fa2a |
| 7 |
|
| 8 |
dev-libs/liborcus: Fix bashisms in configure.ac, --disable-static |
| 9 |
|
| 10 |
Reported-by: Matt Whitlock <gentoo <AT> mattwhitlock.name> |
| 11 |
Closes: https://bugs.gentoo.org/723130 |
| 12 |
Package-Manager: Portage-2.3.100, Repoman-2.3.22 |
| 13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 14 |
|
| 15 |
.../liborcus/files/liborcus-0.15.4-bashism.patch | 26 ++++++++++++++++++++++ |
| 16 |
dev-libs/liborcus/liborcus-0.15.4.ebuild | 14 +++++++----- |
| 17 |
dev-libs/liborcus/liborcus-9999.ebuild | 8 +++---- |
| 18 |
3 files changed, 38 insertions(+), 10 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-libs/liborcus/files/liborcus-0.15.4-bashism.patch b/dev-libs/liborcus/files/liborcus-0.15.4-bashism.patch |
| 21 |
new file mode 100644 |
| 22 |
index 00000000000..cc201a5024e |
| 23 |
--- /dev/null |
| 24 |
+++ b/dev-libs/liborcus/files/liborcus-0.15.4-bashism.patch |
| 25 |
@@ -0,0 +1,26 @@ |
| 26 |
+From 7d2ae0b6e47aa0c1fc43a91300d82c5394420162 Mon Sep 17 00:00:00 2001 |
| 27 |
+From: Ryo ONODERA <ryo@××××××.org> |
| 28 |
+Date: Sat, 11 Jan 2020 23:01:29 +0900 |
| 29 |
+Subject: [PATCH] Improve POSIX shell portability |
| 30 |
+ |
| 31 |
+DO not use bash syntax. |
| 32 |
+--- |
| 33 |
+ configure.ac | 2 +- |
| 34 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 35 |
+ |
| 36 |
+diff --git a/configure.ac b/configure.ac |
| 37 |
+index bc5dc195..a854c0c9 100644 |
| 38 |
+--- a/configure.ac |
| 39 |
++++ b/configure.ac |
| 40 |
+@@ -322,7 +322,7 @@ AC_ARG_ENABLE([werror], |
| 41 |
+ [enable_werror="$enableval"], |
| 42 |
+ [enable_werror=no] |
| 43 |
+ ) |
| 44 |
+-AS_IF([test x"$enable_werror" == "xyes"], [ |
| 45 |
++AS_IF([test x"$enable_werror" = "xyes"], [ |
| 46 |
+ CXXFLAGS="$CXXFLAGS -Werror" |
| 47 |
+ ]) |
| 48 |
+ |
| 49 |
+-- |
| 50 |
+2.26.2 |
| 51 |
+ |
| 52 |
|
| 53 |
diff --git a/dev-libs/liborcus/liborcus-0.15.4.ebuild b/dev-libs/liborcus/liborcus-0.15.4.ebuild |
| 54 |
index 231fb4345b5..999baa80ea0 100644 |
| 55 |
--- a/dev-libs/liborcus/liborcus-0.15.4.ebuild |
| 56 |
+++ b/dev-libs/liborcus/liborcus-0.15.4.ebuild |
| 57 |
@@ -4,14 +4,14 @@ |
| 58 |
EAPI=7 |
| 59 |
|
| 60 |
PYTHON_COMPAT=( python3_{6,7,8} ) |
| 61 |
-inherit python-single-r1 |
| 62 |
+inherit autotools python-single-r1 |
| 63 |
|
| 64 |
DESCRIPTION="Standalone file import filter library for spreadsheet documents" |
| 65 |
HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md" |
| 66 |
|
| 67 |
if [[ ${PV} == *9999* ]]; then |
| 68 |
EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git" |
| 69 |
- inherit git-r3 autotools |
| 70 |
+ inherit git-r3 |
| 71 |
else |
| 72 |
SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz" |
| 73 |
KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86" |
| 74 |
@@ -19,7 +19,9 @@ fi |
| 75 |
|
| 76 |
LICENSE="MIT" |
| 77 |
SLOT="0/0.15" # based on SONAME of liborcus.so |
| 78 |
-IUSE="python +spreadsheet-model static-libs tools" |
| 79 |
+IUSE="python +spreadsheet-model tools" |
| 80 |
+ |
| 81 |
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 82 |
|
| 83 |
RDEPEND=" |
| 84 |
dev-libs/boost:=[zlib(+)] |
| 85 |
@@ -31,7 +33,7 @@ DEPEND="${RDEPEND} |
| 86 |
dev-util/mdds:1/1.5 |
| 87 |
" |
| 88 |
|
| 89 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 90 |
+PATCHES=( "${FILESDIR}/${P}-bashism.patch" ) # bug 723130 |
| 91 |
|
| 92 |
pkg_setup() { |
| 93 |
use python && python-single-r1_pkg_setup |
| 94 |
@@ -39,15 +41,15 @@ pkg_setup() { |
| 95 |
|
| 96 |
src_prepare() { |
| 97 |
default |
| 98 |
- [[ ${PV} == *9999 ]] && eautoreconf |
| 99 |
+ eautoreconf |
| 100 |
} |
| 101 |
|
| 102 |
src_configure() { |
| 103 |
local myeconfargs=( |
| 104 |
+ --disable-static |
| 105 |
--disable-werror |
| 106 |
$(use_enable python) |
| 107 |
$(use_enable spreadsheet-model) |
| 108 |
- $(use_enable static-libs static) |
| 109 |
$(use_with tools) |
| 110 |
) |
| 111 |
econf "${myeconfargs[@]}" |
| 112 |
|
| 113 |
diff --git a/dev-libs/liborcus/liborcus-9999.ebuild b/dev-libs/liborcus/liborcus-9999.ebuild |
| 114 |
index 0ae4b1aa76b..3aa2c7dcba2 100644 |
| 115 |
--- a/dev-libs/liborcus/liborcus-9999.ebuild |
| 116 |
+++ b/dev-libs/liborcus/liborcus-9999.ebuild |
| 117 |
@@ -21,7 +21,9 @@ fi |
| 118 |
|
| 119 |
LICENSE="MIT" |
| 120 |
SLOT="0/0.16" # based on SONAME of liborcus.so |
| 121 |
-IUSE="python +spreadsheet-model static-libs tools" |
| 122 |
+IUSE="python +spreadsheet-model tools" |
| 123 |
+ |
| 124 |
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 125 |
|
| 126 |
RDEPEND=" |
| 127 |
dev-libs/boost:=[zlib(+)] |
| 128 |
@@ -33,8 +35,6 @@ DEPEND="${RDEPEND} |
| 129 |
dev-util/mdds:${MDDS_SLOT} |
| 130 |
" |
| 131 |
|
| 132 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 133 |
- |
| 134 |
pkg_setup() { |
| 135 |
use python && python-single-r1_pkg_setup |
| 136 |
} |
| 137 |
@@ -46,10 +46,10 @@ src_prepare() { |
| 138 |
|
| 139 |
src_configure() { |
| 140 |
local myeconfargs=( |
| 141 |
+ --disable-static |
| 142 |
--disable-werror |
| 143 |
$(use_enable python) |
| 144 |
$(use_enable spreadsheet-model) |
| 145 |
- $(use_enable static-libs static) |
| 146 |
$(use_with tools) |
| 147 |
) |
| 148 |
econf "${myeconfargs[@]}" |
Archives