diff options
author | Mike Frysinger <vapier@gentoo.org> | 2015-08-12 09:54:05 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2015-08-12 09:55:04 -0400 |
commit | d4017f5e973af975a3facf642ddc027bd965eba8 (patch) | |
tree | efc480368a0d198202189a5b5fe38c72caa18136 /sys-libs/ncurses | |
parent | kde-frameworks: add 5.13.0 (diff) | |
download | gentoo-d4017f5e973af975a3facf642ddc027bd965eba8.tar.gz gentoo-d4017f5e973af975a3facf642ddc027bd965eba8.tar.bz2 gentoo-d4017f5e973af975a3facf642ddc027bd965eba8.zip |
sys-libs/ncurses: fix header mismatch with multilib installs #557360
The progs change had a subtle effect that broke multilib builds.
A few ticlib headers aren't installed when progs are disabled.
Add a patch to always install them regardless of the progs state.
Diffstat (limited to 'sys-libs/ncurses')
-rw-r--r-- | sys-libs/ncurses/files/ncurses-6.0-ticlib.patch | 15 | ||||
-rw-r--r-- | sys-libs/ncurses/ncurses-6.0.ebuild | 1 |
2 files changed, 16 insertions, 0 deletions
diff --git a/sys-libs/ncurses/files/ncurses-6.0-ticlib.patch b/sys-libs/ncurses/files/ncurses-6.0-ticlib.patch new file mode 100644 index 000000000000..188e6adff8c7 --- /dev/null +++ b/sys-libs/ncurses/files/ncurses-6.0-ticlib.patch @@ -0,0 +1,15 @@ +always include ticlib even when progs are disabled + +https://bugs.gentoo.org/557360 + +--- a/configure ++++ b/configure +@@ -21312,7 +21312,7 @@ echo "$as_me:21311: checking for library subsets" >&5 + echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 + LIB_SUBSETS= + +-if test "x$cf_with_progs" = xyes || test "$with_ticlib" != no || test "$with_termcap" != no; then ++if true; then + LIB_SUBSETS="${LIB_SUBSETS}ticlib" + if test "$with_ticlib" != no ; then + LIB_SUBSETS="${LIB_SUBSETS} " diff --git a/sys-libs/ncurses/ncurses-6.0.ebuild b/sys-libs/ncurses/ncurses-6.0.ebuild index a73d58f8f1ef..898956c774f1 100644 --- a/sys-libs/ncurses/ncurses-6.0.ebuild +++ b/sys-libs/ncurses/ncurses-6.0.ebuild @@ -34,6 +34,7 @@ PATCHES=( "${FILESDIR}/${PN}-6.0-rxvt-unicode-9.15.patch" #192083 #383871 "${FILESDIR}/${PN}-6.0-pkg-config.patch" "${FILESDIR}/${PN}-5.9-gcc-5.patch" #545114 + "${FILESDIR}/${PN}-6.0-ticlib.patch" #557360 ) src_prepare() { |