From: "Mike Frysinger" <vapier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/ncurses/
Date: Wed, 12 Aug 2015 10:38:20 +0000 (UTC) [thread overview]
Message-ID: <1439375892.f812f0eafe80c5dc524b300f41c7d32b35e8f6f1.vapier@gentoo> (raw)
commit: f812f0eafe80c5dc524b300f41c7d32b35e8f6f1
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 12 10:36:55 2015 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Aug 12 10:38:12 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f812f0ea
sys-libs/ncurses: add USE=threads support #510440
Now that we support the new ABI 6, we can support installing the threaded
versions of ncurses alongside the non-threaded.
sys-libs/ncurses/ncurses-6.0.ebuild | 73 ++++++++++++++++++++++++++-----------
1 file changed, 51 insertions(+), 22 deletions(-)
diff --git a/sys-libs/ncurses/ncurses-6.0.ebuild b/sys-libs/ncurses/ncurses-6.0.ebuild
index b0bd0f9..a73d58f 100644
--- a/sys-libs/ncurses/ncurses-6.0.ebuild
+++ b/sys-libs/ncurses/ncurses-6.0.ebuild
@@ -18,7 +18,7 @@ LICENSE="MIT"
# The subslot reflects the SONAME.
SLOT="5/6"
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 test tinfo trace unicode"
+IUSE="ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode"
DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
# berkdb? ( sys-libs/db )"
@@ -46,6 +46,18 @@ src_configure() {
tc-export_build_env BUILD_{CC,CPP}
BUILD_CPPFLAGS+=" -D_GNU_SOURCE" #214642
+ # Build the various variants of ncurses -- narrow, wide, and threaded. #510440
+ # Order matters here -- we want unicode/thread versions to come last so that the
+ # binaries in /usr/bin support both wide and narrow.
+ # The naming is also important as we use these directly with filenames and when
+ # checking configure flags.
+ NCURSES_TARGETS=(
+ ncurses
+ $(usex unicode 'ncursesw' '')
+ $(usex threads 'ncursest' '')
+ $(use unicode && usex threads 'ncursestw' '')
+ )
+
# when cross-compiling, we need to build up our own tic
# because people often don't keep matching host/target
# ncurses versions #249363
@@ -61,15 +73,15 @@ src_configure() {
}
multilib_src_configure() {
+ local t
multijob_init
- multijob_child_init do_configure narrowc
- use unicode && multijob_child_init do_configure widec --enable-widec --includedir="${EPREFIX}"/usr/include/ncursesw
+ for t in "${NCURSES_TARGETS[@]}" ; do
+ multijob_child_init do_configure "${t}"
+ done
multijob_finish
}
do_configure() {
- ECONF_SOURCE=${S}
-
local target=$1
shift
@@ -124,9 +136,26 @@ do_configure() {
$(use_with tinfo termlib)
)
+ if [[ ${target} == ncurses*w ]] ; then
+ conf+=( --enable-widec )
+ else
+ conf+=( --disable-widec )
+ fi
+ if [[ ${target} == ncursest* ]] ; then
+ conf+=( --with-{pthread,reentrant} )
+ else
+ conf+=( --without-{pthread,reentrant} )
+ fi
+ # Make sure each variant goes in a unique location.
+ if [[ ${target} != "ncurses" ]] ; then
+ conf+=( --includedir="${EPREFIX}"/usr/include/${target} )
+ fi
+
# Force bash until upstream rebuilds the configure script with a newer
# version of autotools. #545532
- CONFIG_SHELL=/bin/bash econf "${conf[@]}" "$@"
+ CONFIG_SHELL=/bin/bash \
+ ECONF_SOURCE=${S} \
+ econf "${conf[@]}" "$@"
}
src_compile() {
@@ -141,8 +170,10 @@ src_compile() {
}
multilib_src_compile() {
- do_compile narrowc
- use unicode && do_compile widec
+ local t
+ for t in "${NCURSES_TARGETS[@]}" ; do
+ do_compile "${t}"
+ done
}
do_compile() {
@@ -169,22 +200,20 @@ multilib_src_install() {
# use the cross-compiled tic (if need be) #249363
export PATH="${BUILD_DIR}/cross/progs:${PATH}"
- # 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
- emake DESTDIR="${D}" install
+ local target
+ for target in "${NCURSES_TARGETS[@]}" ; do
+ emake -C "${BUILD_DIR}/${target}" DESTDIR="${D}" install
+ done
+
+ # Move main libraries into /.
+ if multilib_is_native_abi ; then
+ gen_usr_ldscript -a \
+ "${NCURSES_TARGETS[@]}"
+ $(use tinfo && usex unicode 'tinfow' '') \
+ $(usev tinfo)
fi
-
- # Move libncurses{,w} into /lib
- multilib_is_native_abi && gen_usr_ldscript -a \
- ncurses \
- $(usex unicode 'ncursesw' '') \
- $(use tinfo && usex unicode 'tinfow' '') \
- $(usev tinfo)
if ! tc-is-static-only ; then
+ # Provide a link for -lcurses.
ln -sf libncurses$(get_libname) "${ED}"/usr/$(get_libdir)/libcurses$(get_libname) || die
fi
use static-libs || find "${ED}"/usr/ -name '*.a' -delete
next reply other threads:[~2015-08-12 10:38 UTC|newest]
Thread overview: 264+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-12 10:38 Mike Frysinger [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-10-03 0:07 [gentoo-commits] repo/gentoo:master commit in: sys-libs/ncurses/ Sam James
2025-09-12 14:19 Arthur Zamarin
2025-09-12 14:19 Arthur Zamarin
2025-09-12 14:18 Arthur Zamarin
2025-09-12 14:18 Arthur Zamarin
2025-09-12 14:18 Arthur Zamarin
2025-09-12 14:18 Arthur Zamarin
2025-09-06 15:54 Sam James
2025-09-04 20:32 Sam James
2025-09-01 5:55 Arthur Zamarin
2025-09-01 5:55 Arthur Zamarin
2025-09-01 5:55 Arthur Zamarin
2025-09-01 5:55 Arthur Zamarin
2025-09-01 5:55 Arthur Zamarin
2025-08-06 4:06 Sam James
2025-08-06 4:06 Sam James
2025-07-21 2:57 Sam James
2025-07-21 2:57 Sam James
2025-07-21 2:57 Sam James
2025-07-21 2:57 Sam James
2025-07-21 2:57 Sam James
2025-07-21 2:57 Sam James
2025-07-13 9:13 Sam James
2025-07-13 8:58 Sam James
2025-06-01 22:21 Sam James
2025-04-03 4:53 Sam James
2025-03-20 1:23 Sam James
2025-03-20 1:23 Sam James
2025-03-20 1:23 Sam James
2025-03-20 1:23 Sam James
2025-03-20 1:23 Sam James
2025-03-20 1:23 Sam James
2025-03-20 1:23 Sam James
2025-03-14 5:17 Sam James
2025-03-13 15:41 Sam James
2025-03-13 15:41 Sam James
2025-03-13 6:21 Sam James
2025-03-13 3:15 Sam James
2025-03-13 3:15 Sam James
2025-03-13 3:15 Sam James
2025-03-13 3:15 Sam James
2025-03-13 1:21 Sam James
2025-03-13 1:21 Sam James
2025-03-13 1:09 Sam James
2025-03-06 1:44 Sam James
2025-02-16 14:46 Sam James
2025-01-26 4:41 Sam James
2025-01-25 16:10 Sam James
2025-01-04 11:44 Sam James
2024-12-07 2:55 Sam James
2024-12-06 13:04 Sam James
2024-11-17 5:47 Sam James
2024-11-03 21:51 Andreas K. Hüttel
2024-06-22 12:28 Sam James
2024-06-22 12:28 Sam James
2024-05-11 15:19 Sam James
2024-05-07 18:54 Sam James
2024-04-28 4:32 Sam James
2024-04-28 4:32 Sam James
2024-04-28 4:32 Sam James
2024-04-28 4:32 Sam James
2024-04-28 4:32 Sam James
2024-04-28 4:32 Sam James
2024-04-28 4:32 Sam James
2024-04-28 4:03 Sam James
2024-04-28 4:03 Sam James
2024-04-28 4:03 Sam James
2024-04-28 4:03 Sam James
2024-04-28 4:03 Sam James
2024-04-28 4:03 Sam James
2024-04-28 4:03 Sam James
2024-04-28 4:03 Sam James
2024-04-15 2:09 Sam James
2024-04-15 2:03 Sam James
2024-04-06 9:04 Sam James
2023-06-29 6:18 Sam James
2023-06-25 19:17 Sam James
2023-06-02 18:39 Sam James
2023-06-02 0:33 Sam James
2023-05-29 18:21 Sam James
2023-05-21 2:22 Sam James
2023-05-13 7:15 Arthur Zamarin
2023-05-13 3:54 Sam James
2023-05-13 3:54 Sam James
2023-05-13 3:34 Sam James
2023-05-13 3:17 Sam James
2023-05-13 3:17 Sam James
2023-05-13 3:17 Sam James
2023-05-13 3:17 Sam James
2023-05-13 2:35 Sam James
2023-04-13 7:27 Sam James
2023-04-13 1:49 Sam James
2023-02-24 12:59 Sam James
2023-02-22 7:42 Sam James
2023-01-01 1:30 Sam James
2022-12-30 20:02 Mike Gilbert
2022-12-30 20:02 Mike Gilbert
2022-12-30 20:02 Mike Gilbert
2022-12-30 20:02 Mike Gilbert
2022-12-29 16:17 James Le Cuirot
2022-12-16 20:45 Arthur Zamarin
2022-12-16 15:54 Arthur Zamarin
2022-12-06 16:55 Sam James
2022-11-06 3:17 Mike Gilbert
2022-11-06 3:12 Mike Gilbert
2022-11-06 3:12 Mike Gilbert
2022-11-06 3:12 Mike Gilbert
2022-11-06 3:12 Mike Gilbert
2022-09-28 20:17 Sam James
2022-09-25 5:05 Sam James
2022-09-25 1:15 Sam James
2022-09-19 3:05 Sam James
2022-09-19 3:05 Sam James
2022-09-11 16:49 Sam James
2022-09-11 16:43 Sam James
2022-09-11 14:50 Sam James
2022-09-09 12:41 Sam James
2022-09-09 12:40 Sam James
2022-09-09 12:34 Sam James
2022-09-09 11:30 Sam James
2022-09-09 11:19 Sam James
2022-09-01 2:21 Sam James
2022-08-29 19:06 Sam James
2022-08-26 10:03 Sam James
2022-08-26 6:36 Sam James
2022-08-26 6:36 Sam James
2022-07-29 2:54 Sam James
2022-05-14 9:39 Jakov Smolić
2022-05-14 9:39 Jakov Smolić
2022-05-14 9:19 Jakov Smolić
2022-05-14 9:18 Jakov Smolić
2022-05-14 9:18 Jakov Smolić
2022-05-14 9:18 Jakov Smolić
2022-05-14 9:17 Arthur Zamarin
2022-05-14 8:35 Jakov Smolić
2022-05-08 9:02 WANG Xuerui
2022-05-08 9:02 WANG Xuerui
2022-05-03 17:52 Arthur Zamarin
2022-05-03 2:47 Sam James
2022-05-01 0:40 Sam James
2022-04-29 19:21 Sam James
2022-04-29 19:21 Sam James
2022-04-29 8:14 Sam James
2022-04-29 6:05 Agostino Sarubbo
2022-04-29 6:04 Agostino Sarubbo
2022-04-29 6:04 Agostino Sarubbo
2022-04-28 0:55 Sam James
2022-04-28 0:55 Sam James
2022-04-28 0:46 Sam James
2022-04-06 18:08 David Seifert
2021-11-11 3:28 Sam James
2021-11-10 3:19 Sam James
2021-11-01 2:23 Mike Frysinger
2021-10-27 15:07 Sam James
2021-10-27 4:13 Sam James
2021-10-26 3:14 Sam James
2021-10-24 0:19 Sam James
2021-10-23 13:51 Sam James
2021-10-23 13:51 Sam James
2021-10-23 13:51 Sam James
2021-10-23 13:51 Sam James
2021-10-22 8:21 Lars Wendler
2021-09-18 18:26 Sam James
2021-07-19 13:59 Lars Wendler
2021-05-09 12:53 David Seifert
2021-01-06 15:35 Fabian Groffen
2020-12-26 20:59 Sam James
2020-12-26 20:56 Sam James
2020-11-27 23:51 Sam James
2020-07-14 10:49 Lars Wendler
2020-05-11 16:49 Agostino Sarubbo
2020-05-10 8:10 Sergei Trofimovich
2020-05-08 17:15 Agostino Sarubbo
2020-05-08 17:13 Agostino Sarubbo
2020-05-08 17:11 Agostino Sarubbo
2020-05-06 14:23 Agostino Sarubbo
2020-03-29 10:16 Sergei Trofimovich
2020-02-13 10:20 Lars Wendler
2019-12-24 14:00 Mikle Kolyada
2019-12-17 21:41 Sergei Trofimovich
2019-12-15 14:07 Agostino Sarubbo
2019-12-15 13:59 Agostino Sarubbo
2019-12-15 12:48 Agostino Sarubbo
2019-12-15 11:38 Agostino Sarubbo
2019-12-15 10:36 Mikle Kolyada
2019-12-14 23:01 Aaron Bauman
2019-07-28 20:07 Mikle Kolyada
2019-07-28 20:07 Mikle Kolyada
2019-07-28 20:07 Mikle Kolyada
2019-07-21 14:55 Aaron Bauman
2019-07-21 8:16 Sergei Trofimovich
2019-07-19 11:33 Agostino Sarubbo
2019-07-18 14:26 Agostino Sarubbo
2019-07-18 13:11 Agostino Sarubbo
2019-07-18 13:07 Agostino Sarubbo
2019-07-18 13:06 Agostino Sarubbo
2019-07-18 7:26 Agostino Sarubbo
2019-07-17 14:03 Agostino Sarubbo
2019-07-17 12:17 Mikle Kolyada
2019-07-16 15:13 Lars Wendler
2019-07-16 15:13 Lars Wendler
2019-06-08 22:25 James Le Cuirot
2019-05-21 18:21 Lars Wendler
2019-05-03 23:03 Mikle Kolyada
2018-06-25 22:02 Mike Frysinger
2018-06-25 22:02 Mike Frysinger
2018-05-17 8:49 Mikle Kolyada
2018-04-17 18:56 Lars Wendler
2018-04-17 17:58 Thomas Deutschmann
2018-04-15 17:01 Mikle Kolyada
2018-04-08 6:54 Matt Turner
2018-03-31 9:38 Jeroen Roovers
2018-03-28 19:45 Mart Raudsepp
2018-03-28 7:47 Lars Wendler
2018-03-27 19:07 Sergei Trofimovich
2018-03-25 20:22 Sergei Trofimovich
2018-03-25 13:46 Sergei Trofimovich
2018-03-24 21:19 Sergei Trofimovich
2018-03-24 8:00 Mikle Kolyada
2018-02-21 14:52 Lars Wendler
2018-02-21 8:13 Lars Wendler
2018-02-21 5:19 Jeroen Roovers
2018-02-20 13:57 Lars Wendler
2018-01-28 21:22 Lars Wendler
2018-01-20 18:34 Mike Frysinger
2018-01-02 11:08 Mike Frysinger
2017-12-31 21:49 Michał Górny
2017-03-09 5:01 Mike Frysinger
2017-01-15 15:28 Benda XU
2016-12-06 5:42 Mike Frysinger
2016-12-04 15:45 Lars Wendler
2016-11-15 15:40 Mike Frysinger
2016-11-15 15:40 Mike Frysinger
2016-10-26 16:35 Markus Meier
2016-10-21 18:13 Tobias Klausmann
2016-10-21 18:11 Tobias Klausmann
2016-10-09 7:30 Jeroen Roovers
2016-02-09 14:54 Fabian Groffen
2015-12-21 19:01 Michał Górny
2015-12-21 14:49 Patrick Lauer
2015-11-24 17:31 Mike Frysinger
2015-10-14 5:40 Benda XU
2015-10-02 12:01 Michał Górny
2015-08-31 18:44 Fabian Groffen
2015-08-30 1:52 Mike Gilbert
2015-08-28 17:39 Mike Frysinger
2015-08-28 10:53 Jason Zaman
2015-08-27 17:03 Jason Zaman
2015-08-27 17:03 Jason Zaman
2015-08-27 11:59 Jason Zaman
2015-08-27 6:53 Mike Frysinger
2015-08-26 18:20 Mike Frysinger
2015-08-26 12:28 Justin Lecher
2015-08-26 12:19 Justin Lecher
2015-08-17 13:52 Mike Frysinger
2015-08-17 13:52 Mike Frysinger
2015-08-12 10:38 Mike Frysinger
2015-08-12 10:38 Mike Frysinger
2015-08-12 10:38 Mike Frysinger
2015-08-12 10:38 Mike Frysinger
2015-08-12 10:38 Mike Frysinger
2015-08-12 10:38 Mike Frysinger
2015-08-12 10:09 Mike Frysinger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1439375892.f812f0eafe80c5dc524b300f41c7d32b35e8f6f1.vapier@gentoo \
--to=vapier@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox