summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2008-03-11 15:06:40 +0000
committerRoy Marples <roy@marples.name>2008-03-11 15:06:40 +0000
commit4c0edeabe531a93a7e88a31871fe78adc29b7003 (patch)
treecda7a514a814f0a878b6d74f77ed546a13044e35
parentRemove useless comment. (diff)
downloaduberlord-4c0edeabe531a93a7e88a31871fe78adc29b7003.tar.gz
uberlord-4c0edeabe531a93a7e88a31871fe78adc29b7003.tar.bz2
uberlord-4c0edeabe531a93a7e88a31871fe78adc29b7003.zip
Prefer static over PAM, as PAM is only used by s-s-d and only for pam_limits.so.
-rw-r--r--sys-apps/openrc/Manifest2
-rw-r--r--sys-apps/openrc/openrc-9999.ebuild17
2 files changed, 10 insertions, 9 deletions
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index ef37703..cdc8f03 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1 +1 @@
-EBUILD openrc-9999.ebuild 4125 RMD160 08214d6cf99261f353c0280b6c8d1c2f37c89114 SHA1 0cc9b0198abc25ddf789f4bf59793d068a016343 SHA256 15391d09b231f69b3d7ea2ecdd8098cab0cbbea3ae75824527f952757089a7c5
+EBUILD openrc-9999.ebuild 4121 RMD160 494be1e530bf261f74edd6b7dfd40754e0d42455 SHA1 2c70ee0ddc4b3f05e952211e903012d8c71af110 SHA256 1fb5ef9bc96a16b6b983be0fe88df054793bd89e865b11b762b0bcab3b2209eb
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index cc1483c..9afaca6 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -49,20 +49,21 @@ pkg_setup() {
[ -n "${brand}" ] && MAKE_ARGS="${MAKE_ARGS} BRANDING=Gentoo\040${brand}"
use ncurses && MAKE_ARGS="${MAKE_ARGS} MKTERMCAP=ncurses"
- if use pam; then
- MAKE_ARGS="${MAKE_ARGS} MKPAM=pam"
- if use static; then
- ewarn "OpenRC cannot be built statically with PAM"
- elog "not building statically"
- fi
- fi
- if use static && ! use pam; then
+ if use static; then
if use elibc_glibc; then
MAKE_ARGS="${MAKE_ARGS} PROGLDFLAGS=-Wl,-Bstatic"
else
MAKE_ARGS="${MAKE_ARGS} PROGLDFLAGS=-static"
fi
fi
+ if use pam; then
+ if use static; then
+ ewarn "OpenRC cannot be built statically with PAM"
+ elog "not building PAM support"
+ else
+ MAKE_ARGS="${MAKE_ARGS} MKPAM=pam"
+ fi
+ fi
MAKE_ARGS="${MAKE_ARGS} CC=$(tc-getCC)"
}