[patch] ebuild patch to add threads support

ncurses-threads.patch (text/plain), 2.61 KB, created by Luke-Jr on 2014-05-21 02:50:12 UTC

--- /usr/portage/sys-libs/ncurses/ncurses-5.9-r3.ebuild	2014-04-28 18:01:35.000000000 +0000
+++ ncurses-5.9-r4.ebuild	2014-05-21 00:20:34.000000000 +0000
@@ -15,7 +15,7 @@
 LICENSE="MIT"
 SLOT="5"
 KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="ada +cxx debug doc gpm minimal profile static-libs tinfo trace unicode"
+IUSE="ada +cxx debug doc gpm minimal profile static-libs threads tinfo trace unicode"
 
 DEPEND="gpm? ( sys-libs/gpm )"
 #	berkdb? ( sys-libs/db )"
@@ -61,9 +61,24 @@
 	multilib-minimal_src_configure
 }
 
+NCURSES_TARGETS=(
+	narrowc
+	$(usex unicode widec)
+	$(usex threads tnarrowc)
+	$(use unicode && usex threads twidec)
+)
+
+
 multilib_src_configure() {
+	local threads_opts='--with-pthread --with-reentrant'
+	local unicode_opts='--enable-widec'
+	
 	do_configure narrowc
-	use unicode && do_configure widec --enable-widec --includedir=/usr/include/ncursesw
+	use unicode && do_configure widec --includedir=/usr/include/ncursesw $unicode_opts
+	if use threads; then
+		do_configure tnarrowc --includedir=/usr/include/ncursest $threads_opts
+		use threads && do_configure twidec --includedir=/usr/include/ncursestw $unicode_opts $threads_opts
+	fi
 }
 
 do_configure() {
@@ -121,8 +136,6 @@
 		--with-mmask-t=long
 		--disable-ext-colors
 		--disable-ext-mouse
-		--without-pthread
-		--without-reentrant
 	)
 
 	econf "${conf[@]}" "$@"
@@ -143,8 +156,10 @@
 multilib_src_compile() {
 	make_flags=""
 	multilib_is_native_abi || make_flags="PROGS= "
-	do_compile narrowc
-	use unicode && do_compile widec
+	local target
+	for target in ${NCURSES_TARGETS[@]}; do
+		do_compile $target
+	done
 }
 
 do_compile() {
@@ -170,19 +185,24 @@
 
 	# install unicode version second so that the binaries in /usr/bin
 	# support both wide and narrow
-	cd "${BUILD_DIR}"-narrowc || die
-	emake DESTDIR="${D}" install
-	if use unicode ; then
-		cd "${BUILD_DIR}"-widec || die
+	local target
+	for target in ${NCURSES_TARGETS[@]}; do
+		cd "${BUILD_DIR}"-$target || die
 		emake DESTDIR="${D}" install
-	fi
+	done
 
 	# Move libncurses{,w} into /lib
+	local lib libs=()
+	for lib in ncurses $(usev tinfo); do
+		libs+=(
+			"${lib}"
+			$(usex unicode "${lib}w")
+			$(usex threads "${lib}t")
+			$(use unicode && usex threads "${lib}tw")
+		)
+	done
 	multilib_is_native_abi && gen_usr_ldscript -a \
-		ncurses \
-		$(usex unicode 'ncursesw' '') \
-		$(use tinfo && usex unicode 'tinfow' '') \
-		$(usev tinfo)
+		${libs[@]}
 	ln -sf libncurses.so "${D}"/usr/$(get_libdir)/libcurses.so || die
 	use static-libs || find "${D}"/usr/ -name '*.a' -a '!' -name '*curses++*.a' -delete