diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-27 06:06:27 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-27 06:06:27 +0000 |
| commit | 8d5dbd847cbc704a6a06405856e94b461011afe3 (patch) | |
| tree | 4d26462d027b14926335894749d2e01d982234d0 /sys-apps/grep/grep-3.6.ebuild | |
| parent | 5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (diff) | |
gentoo resync : 27.03.2021
Diffstat (limited to 'sys-apps/grep/grep-3.6.ebuild')
| -rw-r--r-- | sys-apps/grep/grep-3.6.ebuild | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/sys-apps/grep/grep-3.6.ebuild b/sys-apps/grep/grep-3.6.ebuild index 576125c1c746..199fe20c46eb 100644 --- a/sys-apps/grep/grep-3.6.ebuild +++ b/sys-apps/grep/grep-3.6.ebuild @@ -11,10 +11,14 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="nls pcre static" -LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )" +# We lack dev-libs/libsigsegv[static-libs] for now +REQUIRED_USE="static? ( !sparc )" + +LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] ) + sparc? ( dev-libs/libsigsegv )" RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) nls? ( virtual/libintl ) virtual/libiconv" @@ -38,8 +42,13 @@ src_prepare() { src_configure() { use static && append-ldflags -static - # don't link against libsigsegv even when available, bug #673524 - export ac_cv_libsigsegv=no + + # We used to turn this off unconditionally (bug #673524) but we now + # allow it for cases where libsigsegv is better for userspace handling + # of stack overflows. + # In particular, it's necessary for sparc: bug #768135 + export ac_cv_libsigsegv=$(usex sparc) + # Always use pkg-config to get lib info for pcre. export ac_cv_search_pcre_compile=$( usex pcre "$($(tc-getPKG_CONFIG) --libs $(usex static --static '') libpcre)" '' |