| 1 |
commit: 888019eba87e0abe546eb316d24276274cbde3de |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Nov 4 00:13:20 2016 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Nov 4 01:05:57 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=888019eb |
| 7 |
|
| 8 |
sys-apps/systemd: enable pam for non-native abis |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.2_p3 |
| 11 |
|
| 12 |
sys-apps/systemd/systemd-9999.ebuild | 20 ++++++++++++-------- |
| 13 |
1 file changed, 12 insertions(+), 8 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild |
| 16 |
index 5835868..ee96554 100644 |
| 17 |
--- a/sys-apps/systemd/systemd-9999.ebuild |
| 18 |
+++ b/sys-apps/systemd/systemd-9999.ebuild |
| 19 |
@@ -53,7 +53,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.27.1:0=[${MULTILIB_USEDEP}] |
| 20 |
lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] ) |
| 21 |
lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] ) |
| 22 |
nat? ( net-firewall/iptables:0= ) |
| 23 |
- pam? ( virtual/pam:= ) |
| 24 |
+ pam? ( virtual/pam:=[${MULTILIB_USEDEP}] ) |
| 25 |
qrcode? ( media-gfx/qrencode:0= ) |
| 26 |
seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) |
| 27 |
selinux? ( sys-libs/libselinux:0= ) |
| 28 |
@@ -241,7 +241,7 @@ multilib_src_configure() { |
| 29 |
$(use_enable lz4) |
| 30 |
$(use_enable lzma xz) |
| 31 |
$(multilib_native_use_enable nat libiptc) |
| 32 |
- $(multilib_native_use_enable pam) |
| 33 |
+ $(use_enable pam) |
| 34 |
$(multilib_native_use_enable policykit polkit) |
| 35 |
$(multilib_native_use_enable qrcode qrencode) |
| 36 |
$(multilib_native_use_enable seccomp) |
| 37 |
@@ -284,10 +284,14 @@ multilib_src_compile() { |
| 38 |
if multilib_is_native_abi; then |
| 39 |
emake "${mymakeopts[@]}" |
| 40 |
else |
| 41 |
- echo 'gentoo: $(BUILT_SOURCES)' | \ |
| 42 |
- emake "${mymakeopts[@]}" -f Makefile -f - gentoo |
| 43 |
- echo 'gentoo: $(lib_LTLIBRARIES) $(rootlib_LTLIBRARIES) $(pkgconfiglib_DATA)' | \ |
| 44 |
- emake "${mymakeopts[@]}" -f Makefile -f - gentoo |
| 45 |
+ emake built-sources |
| 46 |
+ local targets=( |
| 47 |
+ '$(rootlib_LTLIBRARIES)' |
| 48 |
+ '$(lib_LTLIBRARIES)' |
| 49 |
+ '$(pamlib_LTLIBRARIES)' |
| 50 |
+ '$(pkgconfiglib_DATA)' |
| 51 |
+ ) |
| 52 |
+ echo "gentoo: ${targets[*]}" | emake "${mymakeopts[@]}" -f Makefile -f - gentoo |
| 53 |
fi |
| 54 |
} |
| 55 |
|
| 56 |
@@ -311,11 +315,11 @@ multilib_src_install() { |
| 57 |
emake "${mymakeopts[@]}" install |
| 58 |
else |
| 59 |
mymakeopts+=( |
| 60 |
- install-libLTLIBRARIES |
| 61 |
install-rootlibLTLIBRARIES |
| 62 |
+ install-libLTLIBRARIES |
| 63 |
+ install-pamlibLTLIBRARIES |
| 64 |
install-pkgconfiglibDATA |
| 65 |
install-includeHEADERS |
| 66 |
- # safe to call unconditionally, 'installs' empty list |
| 67 |
install-pkgincludeHEADERS |
| 68 |
) |
Archives