[patch] 0001-sys-libs-readline-allow-linking-to-ncursesw-tinfow-w.patch

0001-sys-libs-readline-allow-linking-to-ncursesw-tinfow-w.patch (text/plain), 1.83 KB, created by Sergei Trofimovich (RETIRED) on 2019-10-13 10:39:43 UTC

From 13946fc1b8916af78d8ef275f30b6797d7169d9b Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <[e-mail]>
Date: Sun, 13 Oct 2019 11:38:53 +0100
Subject: [PATCH] sys-libs/readline: allow linking to ncursesw/tinfow with
 USE=unicode

gdb links to both libncursesw and libreadline.

libncursesw uses libtinfow for tgetent.
libreatline uses libtinfo for tgetent.

As a result sumbols from libtinfo and libtinfow clash and destroy
global variables of libtinfo (or just pass incorrect struct sizes
around).

This fix is to allow readline to link to libtinfow explicitly.
USE=unicode (enabled by default) does exactly that.

Bug: https://bugs.gentoo.org/669488
Bug: https://bugs.gentoo.org/669214
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Sergei Trofimovich <[e-mail]>
---
 sys-libs/readline/readline-8.0_p1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-libs/readline/readline-8.0_p1.ebuild b/sys-libs/readline/readline-8.0_p1.ebuild
index ccd33bb415f..4af7b81a9bc 100644
--- a/sys-libs/readline/readline-8.0_p1.ebuild
+++ b/sys-libs/readline/readline-8.0_p1.ebuild
@@ -42,7 +42,7 @@ esac
 LICENSE="GPL-3"
 SLOT="0/8"  # subslot matches SONAME major
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs utils"
+IUSE="static-libs +unicode utils"
 
 RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
@@ -71,7 +71,7 @@ src_prepare() {
 
 	# Force ncurses linking. #71420
 	# Use pkg-config to get the right values. #457558
-	local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses --libs)
+	local ncurses_libs=$($(tc-getPKG_CONFIG) $(usex unicode ncursesw ncurses) --libs)
 	sed -i \
 		-e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \
 		support/shobj-conf || die
-- 
2.23.0