diff options
| author |   Roy Marples <roy@marples.name> | 2008-01-04 13:39:08 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2008-01-04 13:39:08 +0000 |
| commit | 022f345d69b5e02036e988b6ae89819693843d77 (patch) | |
| tree | f103136362b6e65d37393f9f5ff2e8759983124a | |
| parent | Fix. (diff) | |
| download | uberlord-022f345d69b5e02036e988b6ae89819693843d77.tar.gz uberlord-022f345d69b5e02036e988b6ae89819693843d77.tar.bz2 uberlord-022f345d69b5e02036e988b6ae89819693843d77.zip | |
Disallow pam and static for the time being.
| -rw-r--r-- | sys-apps/openrc/Manifest | 8 | ||||
| -rw-r--r-- | sys-apps/openrc/openrc-9999.ebuild | 35 |
2 files changed, 25 insertions, 18 deletions
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest index 1cbb3e8..a012310 100644 --- a/sys-apps/openrc/Manifest +++ b/sys-apps/openrc/Manifest @@ -1,7 +1,7 @@ -EBUILD openrc-9999.ebuild 4001 RMD160 974b94234890ff7df1939995a7d826c118b07293 SHA1 4eb1bdcc74b71aca107c628fa37c49794f5d692c SHA256 f64d92e4eee4ce46cc7b01733c3332d8932d647cd351dd5f49a5dff671500515 -MD5 a0d8962be911665987104b4f1c6fd578 openrc-9999.ebuild 4001 -RMD160 974b94234890ff7df1939995a7d826c118b07293 openrc-9999.ebuild 4001 -SHA256 f64d92e4eee4ce46cc7b01733c3332d8932d647cd351dd5f49a5dff671500515 openrc-9999.ebuild 4001 +EBUILD openrc-9999.ebuild 4254 RMD160 4ee49267bf9f8ac88eb804f763a4f9dde9324ebb SHA1 7c9c39b8b54188c921d9c561cf417fcf836243b3 SHA256 9ef2031885540906faee12e613e065beada9cee8811504147a298850491fe41e +MD5 f7fded4223287bf47cdd408010d3339e openrc-9999.ebuild 4254 +RMD160 4ee49267bf9f8ac88eb804f763a4f9dde9324ebb openrc-9999.ebuild 4254 +SHA256 9ef2031885540906faee12e613e065beada9cee8811504147a298850491fe41e openrc-9999.ebuild 4254 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-openrc-9999 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-openrc-9999 0 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-openrc-9999 0 diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild index bf49424..bd348f7 100644 --- a/sys-apps/openrc/openrc-9999.ebuild +++ b/sys-apps/openrc/openrc-9999.ebuild @@ -30,26 +30,33 @@ DEPEND="virtual/os-headers" pkg_setup() { LIBDIR="lib" [ "${SYMLINK_LIB}" = "yes" ] && LIBDIR=$(get_abi_LIBDIR "${DEFAULT_ABI}") -} - -make_opts() { - local opts="${opts} LIB=${LIBDIR}" + + MAKE_ARGS="${MAKE_ARGS} LIB=${LIBDIR}" local brand="Unknown" if use kernel_linux; then - opts="${opts} OS=Linux" + MAKE_ARGS="${MAKE_ARGS} OS=Linux" brand="Linux" else - opts="${opts} OS=BSD" + MAKE_ARGS="${MAKE_ARGS} OS=BSD" use kernel_FreeBSD && brand="FreeBSD" fi - [ -n "${brand}" ] && opts="${opts} BRANDING=Gentoo/${brand}" + [ -n "${brand}" ] && MAKE_ARGS="${MAKE_ARGS} BRANDING=Gentoo/${brand}" + + local pamok=true + if use pam && use static; then + if has_version sys-libs/pam; then + ewarn "You cannot build a static OpenRC against LinuxPAM" + elog "Disabling PAM" + pamok=false + fi + fi - use ncurses && opts="${opts} TERMCAP=ncurses" - use pam && opts="${opts} PAM=pam" - use static && opts="${opts} BIN_LDFLAGS=-static" + use ncurses && MAKE_ARGS="${MAKE_ARGS} TERMCAP=ncurses" + use pam && ${pamok} && MAKE_ARGS="${MAKE_ARGS} PAM=pam" + use static && MAKE_ARGS="${MAKE_ARGS} BIN_LDFLAGS=-static" - echo "${opts}" + MAKE_ARGS="${MAKE_ARGS} CC=$(tc-getCC)" } # Massage the git repo a little @@ -68,12 +75,12 @@ src_unpack() { fi src_compile() { - emake $(make_opts) CC=$(tc-getCC) depend || die - emake $(make_opts) CC=$(tc-getCC) || die + emake ${MAKE_ARGS} depend || die + emake ${MAKE_ARGS} || die } src_install() { - emake $(make_opts) DESTDIR="${D}" install || die + emake ${MAKE_ARGS} DESTDIR="${D}" install || die # Fix portage bitching about libs and symlinks rm "${D}"/usr/"${LIBDIR}"/libeinfo.so "${D}"/usr/"${LIBDIR}"/librc.so |