From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 647AC1382C5 for ; Wed, 28 Mar 2018 07:47:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 70CC0E098E; Wed, 28 Mar 2018 07:47:05 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 34518E098E for ; Wed, 28 Mar 2018 07:47:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A3284335C95 for ; Wed, 28 Mar 2018 07:47:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C02C21BC for ; Wed, 28 Mar 2018 07:47:01 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1522223210.fc3a9c5ebff98664ab50c9a8ff4e136bea9bd0db.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/ncurses/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/ncurses/ncurses-6.0-r2.ebuild sys-libs/ncurses/ncurses-6.1-r2.ebuild X-VCS-Directories: sys-libs/ncurses/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: fc3a9c5ebff98664ab50c9a8ff4e136bea9bd0db X-VCS-Branch: master Date: Wed, 28 Mar 2018 07:47:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 65550cd9-e0bb-4287-ac75-386b493edc37 X-Archives-Hash: f9a3a6852474970f5899041046e0f958 commit: fc3a9c5ebff98664ab50c9a8ff4e136bea9bd0db Author: Marty E. Plummer protonmail com> AuthorDate: Wed Sep 20 09:09:33 2017 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed Mar 28 07:46:50 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc3a9c5e sys-libs/ncurses: fix mingw-w64 build and runtime *.dll.a files are required for linking on mingw-w64 targets, only delete normal static libraries. --enable-term-driver is required on mingw-w64, otherwise you get a host of undefined reference to `_nc_*' errors, and possibly other windows platforms/runtimes/toolchains. Bug: https://bugs.gentoo.org/631468 Bug: https://bugs.gentoo.org/639670 Package-Manager: Portage-2.3.10, Repoman-2.3.3 Signed-off-by: Marty E. Plummer protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/5734 sys-libs/ncurses/ncurses-6.0-r2.ebuild | 8 +++++++- sys-libs/ncurses/ncurses-6.1-r2.ebuild | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/sys-libs/ncurses/ncurses-6.0-r2.ebuild b/sys-libs/ncurses/ncurses-6.0-r2.ebuild index 15d435938bc..6587f1b72a6 100644 --- a/sys-libs/ncurses/ncurses-6.0-r2.ebuild +++ b/sys-libs/ncurses/ncurses-6.0-r2.ebuild @@ -135,6 +135,9 @@ do_configure() { # The configure script uses ldd to parse the linked output which # is flaky for cross-compiling/multilib/ldd versions/etc... $(use_with gpm gpm libgpm.so.1) + # Required for building on mingw-w64, and possibly other windows + # platforms, bug #639670 + $(use_enable kernel_Winnt term-driver) --disable-termcap --enable-symlinks --with-rcs-ids @@ -240,7 +243,10 @@ multilib_src_install() { # 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 + # don't delete '*.dll.a', needed for linking #631468 + if ! use static-libs; then + find "${ED}"/usr/ -name '*.a' ! -name '*.dll.a' -delete || die + fi # Build fails to create this ... dosym ../share/terminfo /usr/$(get_libdir)/terminfo diff --git a/sys-libs/ncurses/ncurses-6.1-r2.ebuild b/sys-libs/ncurses/ncurses-6.1-r2.ebuild index 5ddb8866751..de2e2215067 100644 --- a/sys-libs/ncurses/ncurses-6.1-r2.ebuild +++ b/sys-libs/ncurses/ncurses-6.1-r2.ebuild @@ -132,6 +132,9 @@ do_configure() { # The configure script uses ldd to parse the linked output which # is flaky for cross-compiling/multilib/ldd versions/etc... $(use_with gpm gpm libgpm.so.1) + # Required for building on mingw-w64, and possibly other windows + # platforms, bug #639670 + $(use_enable kernel_Winnt term-driver) --disable-termcap --enable-symlinks --with-rcs-ids @@ -238,7 +241,10 @@ multilib_src_install() { # 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 + # don't delete '*.dll.a', needed for linking #631468 + if ! use static-libs; then + find "${ED}"/usr/ -name '*.a' ! -name '*.dll.a' -delete || die + fi # Build fails to create this ... dosym ../share/terminfo /usr/$(get_libdir)/terminfo