From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A86EA1384B4 for ; Fri, 18 Dec 2015 20:45:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 61A3FE08C8; Fri, 18 Dec 2015 20:45:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E6F34E08C8 for ; Fri, 18 Dec 2015 20:45:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CCA9833E142 for ; Fri, 18 Dec 2015 20:45:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D927EB33 for ; Fri, 18 Dec 2015 20:45:09 +0000 (UTC) From: "Ian Stakenvicius" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Stakenvicius" Message-ID: <1450471351.bd30d0f89ca44bffd2b7d9c09bee4821f6ebee93.axs@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/files/, sys-boot/grub/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-boot/grub/files/grub-0.97-ncurses-pkgconfig.patch sys-boot/grub/grub-0.97-r17.ebuild X-VCS-Directories: sys-boot/grub/files/ sys-boot/grub/ X-VCS-Committer: axs X-VCS-Committer-Name: Ian Stakenvicius X-VCS-Revision: bd30d0f89ca44bffd2b7d9c09bee4821f6ebee93 X-VCS-Branch: master Date: Fri, 18 Dec 2015 20:45:09 +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: 3c6af100-49e1-4aa0-a24e-aea4ff92cd5a X-Archives-Hash: 1ca90e4368dd7e021e850cfaf4ddb853 commit: bd30d0f89ca44bffd2b7d9c09bee4821f6ebee93 Author: Ian Stakenvicius gentoo org> AuthorDate: Thu Dec 17 17:13:57 2015 +0000 Commit: Ian Stakenvicius gentoo org> CommitDate: Fri Dec 18 20:42:31 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd30d0f8 sys-boot/grub:0 - use pkg-config to determine ncurses libs, bug 550132 When ncurses is built with USE=tinfo, additional libs are needed due to --as-needed linking that are not included in the current AC_CHECK_LIB based config, nor would be easily detectable without pkg-config. Package-Manager: portage-2.2.24 sys-boot/grub/files/grub-0.97-ncurses-pkgconfig.patch | 18 ++++++++++++++++++ sys-boot/grub/grub-0.97-r17.ebuild | 2 ++ 2 files changed, 20 insertions(+) diff --git a/sys-boot/grub/files/grub-0.97-ncurses-pkgconfig.patch b/sys-boot/grub/files/grub-0.97-ncurses-pkgconfig.patch new file mode 100644 index 0000000..d62e434 --- /dev/null +++ b/sys-boot/grub/files/grub-0.97-ncurses-pkgconfig.patch @@ -0,0 +1,18 @@ +--- a/configure.ac 2015-12-17 11:09:56.807893315 -0500 ++++ b/configure.ac 2015-12-17 11:11:06.697570856 -0500 +@@ -234,10 +234,14 @@ + + # Unless the user specify --without-curses, check for curses. + if test "x$with_curses" != "xno"; then ++ PKG_CHECK_MODULES([NCURSES],[ncurses],[ ++ AC_DEFINE(HAVE_LIBCURSES, 1, [Define if you have a curses library]) ++ GRUB_LIBS="$GRUB_LIBS $NCURSES_LIBS" ++ ],[ + AC_CHECK_LIB(ncurses, wgetch, [GRUB_LIBS="$GRUB_LIBS -lncurses" + AC_DEFINE(HAVE_LIBCURSES, 1, [Define if you have a curses library])], + [AC_CHECK_LIB(curses, wgetch, [GRUB_LIBS="$GRUB_LIBS -lcurses" +- AC_DEFINE(HAVE_LIBCURSES, 1, [Define if you have a curses library])])]) ++ AC_DEFINE(HAVE_LIBCURSES, 1, [Define if you have a curses library])])])]) + fi + + AC_SUBST(GRUB_LIBS) diff --git a/sys-boot/grub/grub-0.97-r17.ebuild b/sys-boot/grub/grub-0.97-r17.ebuild index 3b19b8e..790e6b2 100644 --- a/sys-boot/grub/grub-0.97-r17.ebuild +++ b/sys-boot/grub/grub-0.97-r17.ebuild @@ -36,6 +36,7 @@ IUSE="custom-cflags ncurses netboot static" LIB_DEPEND="ncurses? ( >=sys-libs/ncurses-5.9-r3:0[static-libs(+),abi_x86_32(-)] )" RDEPEND="!static? ( ${LIB_DEPEND//[static-libs(+),/=[} )" DEPEND="${RDEPEND} + virtual/pkgconfig static? ( ${LIB_DEPEND} )" pkg_setup() { @@ -69,6 +70,7 @@ src_prepare() { EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch # bug 564890, 566638 epatch "${FILESDIR}"/grub-0.97-Add-esp-to-list-of-clobbered-registers.patch + epatch "${FILESDIR}"/grub-0.97-ncurses-pkgconfig.patch rm -f "${S}"/aclocal.m4 # seems to keep bug 418287 away eautoreconf