| 1 |
commit: 6819e0f6f299cde6cc6bcf2cc1d84101abe80c67 |
| 2 |
Author: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Apr 28 21:37:22 2021 +0000 |
| 4 |
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Apr 28 21:37:42 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6819e0f6 |
| 7 |
|
| 8 |
app-arch/brotli: add USE="static-libs" |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/786558 |
| 11 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
| 12 |
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> |
| 13 |
|
| 14 |
.../brotli/{brotli-9999.ebuild => brotli-1.0.9-r2.ebuild} | 12 +++++++++--- |
| 15 |
app-arch/brotli/brotli-9999.ebuild | 5 +++-- |
| 16 |
2 files changed, 12 insertions(+), 5 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-arch/brotli/brotli-9999.ebuild b/app-arch/brotli/brotli-1.0.9-r2.ebuild |
| 19 |
similarity index 83% |
| 20 |
copy from app-arch/brotli/brotli-9999.ebuild |
| 21 |
copy to app-arch/brotli/brotli-1.0.9-r2.ebuild |
| 22 |
index d84bfa85b3e..9f152be136a 100644 |
| 23 |
--- a/app-arch/brotli/brotli-9999.ebuild |
| 24 |
+++ b/app-arch/brotli/brotli-1.0.9-r2.ebuild |
| 25 |
@@ -17,7 +17,7 @@ SLOT="0/$(ver_cut 1)" |
| 26 |
RDEPEND="python? ( ${PYTHON_DEPS} )" |
| 27 |
DEPEND="${RDEPEND}" |
| 28 |
|
| 29 |
-IUSE="python test" |
| 30 |
+IUSE="python static-libs test" |
| 31 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 32 |
|
| 33 |
LICENSE="MIT python? ( Apache-2.0 )" |
| 34 |
@@ -29,11 +29,16 @@ if [[ ${PV} == "9999" ]] ; then |
| 35 |
EGIT_REPO_URI="https://github.com/google/${PN}.git" |
| 36 |
inherit git-r3 |
| 37 |
else |
| 38 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" |
| 39 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" |
| 40 |
SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 41 |
fi |
| 42 |
|
| 43 |
-RESTRICT="!test? ( test )" |
| 44 |
+# tests are currently broken, see https://github.com/google/brotli/issues/850 |
| 45 |
+RESTRICT="test" |
| 46 |
+ |
| 47 |
+PATCHES=( |
| 48 |
+ "${FILESDIR}/${PV}-linker.patch" |
| 49 |
+) |
| 50 |
|
| 51 |
src_prepare() { |
| 52 |
use python && distutils-r1_src_prepare |
| 53 |
@@ -73,6 +78,7 @@ src_test() { |
| 54 |
|
| 55 |
multilib_src_install() { |
| 56 |
cmake-utils_src_install |
| 57 |
+ use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a || die |
| 58 |
} |
| 59 |
multilib_src_install_all() { |
| 60 |
use python && distutils-r1_src_install |
| 61 |
|
| 62 |
diff --git a/app-arch/brotli/brotli-9999.ebuild b/app-arch/brotli/brotli-9999.ebuild |
| 63 |
index d84bfa85b3e..87affbe108c 100644 |
| 64 |
--- a/app-arch/brotli/brotli-9999.ebuild |
| 65 |
+++ b/app-arch/brotli/brotli-9999.ebuild |
| 66 |
@@ -17,7 +17,7 @@ SLOT="0/$(ver_cut 1)" |
| 67 |
RDEPEND="python? ( ${PYTHON_DEPS} )" |
| 68 |
DEPEND="${RDEPEND}" |
| 69 |
|
| 70 |
-IUSE="python test" |
| 71 |
+IUSE="python static-libs test" |
| 72 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 73 |
|
| 74 |
LICENSE="MIT python? ( Apache-2.0 )" |
| 75 |
@@ -29,7 +29,7 @@ if [[ ${PV} == "9999" ]] ; then |
| 76 |
EGIT_REPO_URI="https://github.com/google/${PN}.git" |
| 77 |
inherit git-r3 |
| 78 |
else |
| 79 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" |
| 80 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" |
| 81 |
SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 82 |
fi |
| 83 |
|
| 84 |
@@ -73,6 +73,7 @@ src_test() { |
| 85 |
|
| 86 |
multilib_src_install() { |
| 87 |
cmake-utils_src_install |
| 88 |
+ use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a || die |
| 89 |
} |
| 90 |
multilib_src_install_all() { |
| 91 |
use python && distutils-r1_src_install |
Archives