| 1 |
commit: bd30d0f89ca44bffd2b7d9c09bee4821f6ebee93 |
| 2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 17 17:13:57 2015 +0000 |
| 4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 18 20:42:31 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd30d0f8 |
| 7 |
|
| 8 |
sys-boot/grub:0 - use pkg-config to determine ncurses libs, bug 550132 |
| 9 |
|
| 10 |
When ncurses is built with USE=tinfo, additional libs are needed due to --as-needed |
| 11 |
linking that are not included in the current AC_CHECK_LIB based config, nor would |
| 12 |
be easily detectable without pkg-config. |
| 13 |
|
| 14 |
Package-Manager: portage-2.2.24 |
| 15 |
|
| 16 |
sys-boot/grub/files/grub-0.97-ncurses-pkgconfig.patch | 18 ++++++++++++++++++ |
| 17 |
sys-boot/grub/grub-0.97-r17.ebuild | 2 ++ |
| 18 |
2 files changed, 20 insertions(+) |
| 19 |
|
| 20 |
diff --git a/sys-boot/grub/files/grub-0.97-ncurses-pkgconfig.patch b/sys-boot/grub/files/grub-0.97-ncurses-pkgconfig.patch |
| 21 |
new file mode 100644 |
| 22 |
index 0000000..d62e434 |
| 23 |
--- /dev/null |
| 24 |
+++ b/sys-boot/grub/files/grub-0.97-ncurses-pkgconfig.patch |
| 25 |
@@ -0,0 +1,18 @@ |
| 26 |
+--- a/configure.ac 2015-12-17 11:09:56.807893315 -0500 |
| 27 |
++++ b/configure.ac 2015-12-17 11:11:06.697570856 -0500 |
| 28 |
+@@ -234,10 +234,14 @@ |
| 29 |
+ |
| 30 |
+ # Unless the user specify --without-curses, check for curses. |
| 31 |
+ if test "x$with_curses" != "xno"; then |
| 32 |
++ PKG_CHECK_MODULES([NCURSES],[ncurses],[ |
| 33 |
++ AC_DEFINE(HAVE_LIBCURSES, 1, [Define if you have a curses library]) |
| 34 |
++ GRUB_LIBS="$GRUB_LIBS $NCURSES_LIBS" |
| 35 |
++ ],[ |
| 36 |
+ AC_CHECK_LIB(ncurses, wgetch, [GRUB_LIBS="$GRUB_LIBS -lncurses" |
| 37 |
+ AC_DEFINE(HAVE_LIBCURSES, 1, [Define if you have a curses library])], |
| 38 |
+ [AC_CHECK_LIB(curses, wgetch, [GRUB_LIBS="$GRUB_LIBS -lcurses" |
| 39 |
+- AC_DEFINE(HAVE_LIBCURSES, 1, [Define if you have a curses library])])]) |
| 40 |
++ AC_DEFINE(HAVE_LIBCURSES, 1, [Define if you have a curses library])])])]) |
| 41 |
+ fi |
| 42 |
+ |
| 43 |
+ AC_SUBST(GRUB_LIBS) |
| 44 |
|
| 45 |
diff --git a/sys-boot/grub/grub-0.97-r17.ebuild b/sys-boot/grub/grub-0.97-r17.ebuild |
| 46 |
index 3b19b8e..790e6b2 100644 |
| 47 |
--- a/sys-boot/grub/grub-0.97-r17.ebuild |
| 48 |
+++ b/sys-boot/grub/grub-0.97-r17.ebuild |
| 49 |
@@ -36,6 +36,7 @@ IUSE="custom-cflags ncurses netboot static" |
| 50 |
LIB_DEPEND="ncurses? ( >=sys-libs/ncurses-5.9-r3:0[static-libs(+),abi_x86_32(-)] )" |
| 51 |
RDEPEND="!static? ( ${LIB_DEPEND//[static-libs(+),/=[} )" |
| 52 |
DEPEND="${RDEPEND} |
| 53 |
+ virtual/pkgconfig |
| 54 |
static? ( ${LIB_DEPEND} )" |
| 55 |
|
| 56 |
pkg_setup() { |
| 57 |
@@ -69,6 +70,7 @@ src_prepare() { |
| 58 |
EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch |
| 59 |
# bug 564890, 566638 |
| 60 |
epatch "${FILESDIR}"/grub-0.97-Add-esp-to-list-of-clobbered-registers.patch |
| 61 |
+ epatch "${FILESDIR}"/grub-0.97-ncurses-pkgconfig.patch |
| 62 |
|
| 63 |
rm -f "${S}"/aclocal.m4 # seems to keep bug 418287 away |
| 64 |
eautoreconf |
Archives