commit: 7ea10d48900febf20a2298445202b92b9bd8b2a6 Author: Felix Janda <felix.janda <AT> posteo <DOT> de> AuthorDate: Mon May 19 19:29:01 2014 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Mon May 19 23:38:21 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=7ea10d48
sys-process/procps: Fix up when built with USE=ncurses --- sys-process/procps/files/procps-3.3.9-configure.patch | 13 +++++++++++++ sys-process/procps/procps-3.3.9-r99.ebuild | 9 +++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/sys-process/procps/files/procps-3.3.9-configure.patch b/sys-process/procps/files/procps-3.3.9-configure.patch new file mode 100644 index 0000000..4822f62 --- /dev/null +++ b/sys-process/procps/files/procps-3.3.9-configure.patch @@ -0,0 +1,13 @@ +--- a/procps-ng-3.3.9/configure.ac ++++ b/procps-ng-3.3.9/configure.ac +@@ -235,7 +235,9 @@ + else + AC_SEARCH_LIBS([dlopen], [dl], [], + [AC_MSG_ERROR([dynamic linking unavailable, circumvent with --disable-numa])]) +- DL_LIB="$ac_cv_search_dlopen" ++ if test "$ac_cv_search_dlopen" != "none required" ; then ++ DL_LIB="$ac_cv_search_dlopen" ++ fi + fi + AC_SUBST([DL_LIB]) + diff --git a/sys-process/procps/procps-3.3.9-r99.ebuild b/sys-process/procps/procps-3.3.9-r99.ebuild index 14dca88..7ef23a8 100644 --- a/sys-process/procps/procps-3.3.9-r99.ebuild +++ b/sys-process/procps/procps-3.3.9-r99.ebuild @@ -4,7 +4,7 @@ EAPI="4" -inherit eutils toolchain-funcs +inherit eutils toolchain-funcs flag-o-matic DESCRIPTION="standard informational utilities and process-handling tools" # http://packages.debian.org/sid/procps @@ -28,11 +28,14 @@ S=${WORKDIR}/${PN}-ng-${PV} src_prepare() { epatch "${FILESDIR}"/${PN}-3.3.8-kill-neg-pid.patch - epatch "${FILESDIR}"/${P}-no-error_h.patch epatch "${FILESDIR}"/${PN}-3.3.8-no-GLOB_TILDE.patch + epatch "${FILESDIR}"/${P}-no-error_h.patch + epatch "${FILESDIR}"/${P}-configure.patch + autoreconf } src_configure() { + use elibc_musl && append-cppflags -D_XOPEN_SOURCE_EXTENDED econf \ --exec-prefix="${EPREFIX}" \ --docdir='$(datarootdir)'/doc/${PF} \ @@ -46,8 +49,6 @@ src_install() { default # dodoc sysctl.conf - mv "${ED}"/usr/bin/pidof "${ED}"/bin/ || die - # The configure script is completely whacked in the head mv "${ED}"/lib* "${ED}"/usr/ || die gen_usr_ldscript -a procps
