1 |
commit: 5bc56543db3f10009d499bc42ce2f04bfe00405d |
2 |
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Oct 31 21:54:15 2018 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Oct 31 21:58:03 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bc56543 |
7 |
|
8 |
sys-apps/util-linux: Rev bump 2.33_rc2-r1, multiple python versions |
9 |
|
10 |
This will build the libmount python bindings for all python versions in |
11 |
PYTHON_TARGETS rather than just what is in PYTHON_SINGLE_TARGET. |
12 |
|
13 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
14 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
15 |
|
16 |
...33_rc2.ebuild => util-linux-2.33_rc2-r1.ebuild} | 68 +++++++++++++++++++--- |
17 |
1 file changed, 61 insertions(+), 7 deletions(-) |
18 |
|
19 |
diff --git a/sys-apps/util-linux/util-linux-2.33_rc2.ebuild b/sys-apps/util-linux/util-linux-2.33_rc2-r1.ebuild |
20 |
similarity index 83% |
21 |
rename from sys-apps/util-linux/util-linux-2.33_rc2.ebuild |
22 |
rename to sys-apps/util-linux/util-linux-2.33_rc2-r1.ebuild |
23 |
index 7060ef533f6..cdfc75a44ba 100644 |
24 |
--- a/sys-apps/util-linux/util-linux-2.33_rc2.ebuild |
25 |
+++ b/sys-apps/util-linux/util-linux-2.33_rc2-r1.ebuild |
26 |
@@ -1,4 +1,5 @@ |
27 |
# Copyright 1999-2018 Gentoo Authors |
28 |
+# Copyright 2018 Sony Interactive Entertainment Inc. |
29 |
# Distributed under the terms of the GNU General Public License v2 |
30 |
|
31 |
EAPI=6 |
32 |
@@ -6,7 +7,7 @@ EAPI=6 |
33 |
PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} ) |
34 |
|
35 |
inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \ |
36 |
- pam python-single-r1 multilib-minimal multiprocessing systemd |
37 |
+ pam python-r1 multilib-minimal multiprocessing systemd |
38 |
|
39 |
MY_PV="${PV/_/-}" |
40 |
MY_P="${PN}-${MY_PV}" |
41 |
@@ -62,10 +63,6 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
42 |
|
43 |
S="${WORKDIR}/${MY_P}" |
44 |
|
45 |
-pkg_setup() { |
46 |
- use python && python-single-r1_pkg_setup |
47 |
-} |
48 |
- |
49 |
src_prepare() { |
50 |
default |
51 |
|
52 |
@@ -108,6 +105,26 @@ lfs_fallocate_test() { |
53 |
rm -f "${T}"/fallocate.${ABI}.c |
54 |
} |
55 |
|
56 |
+python_configure() { |
57 |
+ local myeconfargs=( |
58 |
+ --disable-all-programs |
59 |
+ --disable-bash-completion |
60 |
+ --without-systemdsystemunitdir |
61 |
+ --with-python |
62 |
+ ) |
63 |
+ if use userland_GNU; then |
64 |
+ myeconfargs+=( |
65 |
+ --enable-libblkid |
66 |
+ --enable-libmount |
67 |
+ --enable-pylibmount |
68 |
+ ) |
69 |
+ fi |
70 |
+ mkdir "${BUILD_DIR}" || die |
71 |
+ pushd "${BUILD_DIR}" >/dev/null || die |
72 |
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
73 |
+ popd >/dev/null || die |
74 |
+} |
75 |
+ |
76 |
multilib_src_configure() { |
77 |
lfs_fallocate_test |
78 |
# The scanf test in a run-time test which fails while cross-compiling. |
79 |
@@ -120,9 +137,9 @@ multilib_src_configure() { |
80 |
local myeconfargs=( |
81 |
--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" |
82 |
--with-bashcompletiondir="$(get_bashcompdir)" |
83 |
+ --without-python |
84 |
$(multilib_native_use_enable suid makeinstall-chown) |
85 |
$(multilib_native_use_enable suid makeinstall-setuid) |
86 |
- $(multilib_native_use_with python) |
87 |
$(multilib_native_use_with readline) |
88 |
$(multilib_native_use_with slang) |
89 |
$(multilib_native_use_with systemd) |
90 |
@@ -142,6 +159,7 @@ multilib_src_configure() { |
91 |
--disable-chfn-chsh |
92 |
--disable-login |
93 |
--disable-nologin |
94 |
+ --disable-pylibmount |
95 |
--disable-su |
96 |
--enable-agetty |
97 |
--enable-bash-completion |
98 |
@@ -179,10 +197,44 @@ multilib_src_configure() { |
99 |
fi |
100 |
fi |
101 |
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
102 |
+ |
103 |
+ if multilib_is_native_abi && use python; then |
104 |
+ python_foreach_impl python_configure |
105 |
+ fi |
106 |
+} |
107 |
+ |
108 |
+python_compile() { |
109 |
+ pushd "${BUILD_DIR}" >/dev/null || die |
110 |
+ emake all |
111 |
+ popd >/dev/null || die |
112 |
+} |
113 |
+ |
114 |
+multilib_src_compile() { |
115 |
+ emake all |
116 |
+ |
117 |
+ if multilib_is_native_abi && use python; then |
118 |
+ python_foreach_impl python_compile |
119 |
+ fi |
120 |
+} |
121 |
+ |
122 |
+python_test() { |
123 |
+ pushd "${BUILD_DIR}" >/dev/null || die |
124 |
+ emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot" |
125 |
+ popd >/dev/null || die |
126 |
} |
127 |
|
128 |
multilib_src_test() { |
129 |
emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot" |
130 |
+ if multilib_is_native_abi && use python; then |
131 |
+ python_foreach_impl python_test |
132 |
+ fi |
133 |
+} |
134 |
+ |
135 |
+python_install() { |
136 |
+ pushd "${BUILD_DIR}" >/dev/null || die |
137 |
+ emake DESTDIR="${D}" install |
138 |
+ python_optimize |
139 |
+ popd >/dev/null || die |
140 |
} |
141 |
|
142 |
multilib_src_install() { |
143 |
@@ -191,8 +243,10 @@ multilib_src_install() { |
144 |
if multilib_is_native_abi && use userland_GNU; then |
145 |
# need the libs in / |
146 |
gen_usr_ldscript -a blkid fdisk mount smartcols uuid |
147 |
+ fi |
148 |
|
149 |
- use python && python_optimize |
150 |
+ if multilib_is_native_abi && use python; then |
151 |
+ python_foreach_impl python_install |
152 |
fi |
153 |
} |