| 1 |
commit: a7166b7b1066616e78e15d161b8539466e368081 |
| 2 |
Author: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 5 13:58:22 2021 +0000 |
| 4 |
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 5 13:58:22 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7166b7b |
| 7 |
|
| 8 |
app-arch/brotli: Switch to CMAKE_ECLASS=cmake |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/770565 |
| 11 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
| 12 |
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> |
| 13 |
|
| 14 |
.../{brotli-9999.ebuild => brotli-1.0.9-r3.ebuild} | 18 ++++++++++++------ |
| 15 |
app-arch/brotli/brotli-9999.ebuild | 11 ++++++----- |
| 16 |
2 files changed, 18 insertions(+), 11 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-arch/brotli/brotli-9999.ebuild b/app-arch/brotli/brotli-1.0.9-r3.ebuild |
| 19 |
similarity index 86% |
| 20 |
copy from app-arch/brotli/brotli-9999.ebuild |
| 21 |
copy to app-arch/brotli/brotli-1.0.9-r3.ebuild |
| 22 |
index 87affbe108c..9a372fb3166 100644 |
| 23 |
--- a/app-arch/brotli/brotli-9999.ebuild |
| 24 |
+++ b/app-arch/brotli/brotli-1.0.9-r3.ebuild |
| 25 |
@@ -6,6 +6,7 @@ EAPI=7 |
| 26 |
PYTHON_COMPAT=( python3_{7,8,9} ) |
| 27 |
DISTUTILS_OPTIONAL="1" |
| 28 |
DISTUTILS_IN_SOURCE_BUILD="1" |
| 29 |
+CMAKE_ECLASS=cmake |
| 30 |
|
| 31 |
inherit cmake-multilib distutils-r1 |
| 32 |
|
| 33 |
@@ -33,18 +34,23 @@ else |
| 34 |
SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 35 |
fi |
| 36 |
|
| 37 |
-RESTRICT="!test? ( test )" |
| 38 |
+# tests are currently broken, see https://github.com/google/brotli/issues/850 |
| 39 |
+RESTRICT="test" |
| 40 |
+ |
| 41 |
+PATCHES=( |
| 42 |
+ "${FILESDIR}/${PV}-linker.patch" |
| 43 |
+) |
| 44 |
|
| 45 |
src_prepare() { |
| 46 |
use python && distutils-r1_src_prepare |
| 47 |
- cmake-utils_src_prepare |
| 48 |
+ cmake_src_prepare |
| 49 |
} |
| 50 |
|
| 51 |
multilib_src_configure() { |
| 52 |
local mycmakeargs=( |
| 53 |
-DBUILD_TESTING="$(usex test)" |
| 54 |
) |
| 55 |
- cmake-utils_src_configure |
| 56 |
+ cmake_src_configure |
| 57 |
} |
| 58 |
src_configure() { |
| 59 |
cmake-multilib_src_configure |
| 60 |
@@ -52,7 +58,7 @@ src_configure() { |
| 61 |
} |
| 62 |
|
| 63 |
multilib_src_compile() { |
| 64 |
- cmake-utils_src_compile |
| 65 |
+ cmake_src_compile |
| 66 |
} |
| 67 |
src_compile() { |
| 68 |
cmake-multilib_src_compile |
| 69 |
@@ -64,7 +70,7 @@ python_test() { |
| 70 |
} |
| 71 |
|
| 72 |
multilib_src_test() { |
| 73 |
- cmake-utils_src_test |
| 74 |
+ cmake_src_test |
| 75 |
} |
| 76 |
src_test() { |
| 77 |
cmake-multilib_src_test |
| 78 |
@@ -72,7 +78,7 @@ src_test() { |
| 79 |
} |
| 80 |
|
| 81 |
multilib_src_install() { |
| 82 |
- cmake-utils_src_install |
| 83 |
+ cmake_src_install |
| 84 |
use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a || die |
| 85 |
} |
| 86 |
multilib_src_install_all() { |
| 87 |
|
| 88 |
diff --git a/app-arch/brotli/brotli-9999.ebuild b/app-arch/brotli/brotli-9999.ebuild |
| 89 |
index 87affbe108c..7dacb49548c 100644 |
| 90 |
--- a/app-arch/brotli/brotli-9999.ebuild |
| 91 |
+++ b/app-arch/brotli/brotli-9999.ebuild |
| 92 |
@@ -6,6 +6,7 @@ EAPI=7 |
| 93 |
PYTHON_COMPAT=( python3_{7,8,9} ) |
| 94 |
DISTUTILS_OPTIONAL="1" |
| 95 |
DISTUTILS_IN_SOURCE_BUILD="1" |
| 96 |
+CMAKE_ECLASS=cmake |
| 97 |
|
| 98 |
inherit cmake-multilib distutils-r1 |
| 99 |
|
| 100 |
@@ -37,14 +38,14 @@ RESTRICT="!test? ( test )" |
| 101 |
|
| 102 |
src_prepare() { |
| 103 |
use python && distutils-r1_src_prepare |
| 104 |
- cmake-utils_src_prepare |
| 105 |
+ cmake_src_prepare |
| 106 |
} |
| 107 |
|
| 108 |
multilib_src_configure() { |
| 109 |
local mycmakeargs=( |
| 110 |
-DBUILD_TESTING="$(usex test)" |
| 111 |
) |
| 112 |
- cmake-utils_src_configure |
| 113 |
+ cmake_src_configure |
| 114 |
} |
| 115 |
src_configure() { |
| 116 |
cmake-multilib_src_configure |
| 117 |
@@ -52,7 +53,7 @@ src_configure() { |
| 118 |
} |
| 119 |
|
| 120 |
multilib_src_compile() { |
| 121 |
- cmake-utils_src_compile |
| 122 |
+ cmake_src_compile |
| 123 |
} |
| 124 |
src_compile() { |
| 125 |
cmake-multilib_src_compile |
| 126 |
@@ -64,7 +65,7 @@ python_test() { |
| 127 |
} |
| 128 |
|
| 129 |
multilib_src_test() { |
| 130 |
- cmake-utils_src_test |
| 131 |
+ cmake_src_test |
| 132 |
} |
| 133 |
src_test() { |
| 134 |
cmake-multilib_src_test |
| 135 |
@@ -72,7 +73,7 @@ src_test() { |
| 136 |
} |
| 137 |
|
| 138 |
multilib_src_install() { |
| 139 |
- cmake-utils_src_install |
| 140 |
+ cmake_src_install |
| 141 |
use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a || die |
| 142 |
} |
| 143 |
multilib_src_install_all() { |
Archives