| 1 |
commit: e9b4a8bfad4ca23a97239ff8d1bad011da038fab |
| 2 |
Author: orbea <orbea <AT> riseup <DOT> net> |
| 3 |
AuthorDate: Mon May 9 16:23:51 2022 +0000 |
| 4 |
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 9 16:38:22 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9b4a8bf |
| 7 |
|
| 8 |
dev-scheme/guile-ncurses: Fix build with slibtool |
| 9 |
|
| 10 |
On Gentoo both -lncurses and -ltinfow are needed where the build |
| 11 |
misses the latter. Additionally GNU libtool silently ignores |
| 12 |
-no-undefined while slibtool does not. |
| 13 |
|
| 14 |
Bug: https://bugs.gentoo.org/843416 |
| 15 |
Signed-off-by: orbea <orbea <AT> riseup.net> |
| 16 |
Closes: https://github.com/gentoo/gentoo/pull/25404 |
| 17 |
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> |
| 18 |
|
| 19 |
.../files/guile-ncurses-3.0-slibtool.patch | 38 ++++++++++++++++++++++ |
| 20 |
dev-scheme/guile-ncurses/guile-ncurses-3.0.ebuild | 4 +++ |
| 21 |
2 files changed, 42 insertions(+) |
| 22 |
|
| 23 |
diff --git a/dev-scheme/guile-ncurses/files/guile-ncurses-3.0-slibtool.patch b/dev-scheme/guile-ncurses/files/guile-ncurses-3.0-slibtool.patch |
| 24 |
new file mode 100644 |
| 25 |
index 000000000000..5c102fca6011 |
| 26 |
--- /dev/null |
| 27 |
+++ b/dev-scheme/guile-ncurses/files/guile-ncurses-3.0-slibtool.patch |
| 28 |
@@ -0,0 +1,38 @@ |
| 29 |
+commit 8c8327c8518508380bd68f52db19432b776833e5 |
| 30 |
+Author: orbea <orbea@××××××.net> |
| 31 |
+Date: Mon May 9 09:06:04 2022 -0700 |
| 32 |
+ |
| 33 |
+ build: Link with -ltinfow/-ltinfow to fix undefined references |
| 34 |
+ |
| 35 |
+diff --git a/configure.ac b/configure.ac |
| 36 |
+index f194166..954d9b2 100644 |
| 37 |
+--- a/configure.ac |
| 38 |
++++ b/configure.ac |
| 39 |
+@@ -200,6 +200,13 @@ AS_IF([test "$with_ncursesw" = check], |
| 40 |
+ with_ncursesw=yes], |
| 41 |
+ [AC_MSG_FAILURE([--with-ncursesw was given, but, test for ncursesw failed])])]) |
| 42 |
+ |
| 43 |
++AS_IF([test "$with_ncursesw" = yes], |
| 44 |
++ [AC_SEARCH_LIBS([LINES], [tinfow], |
| 45 |
++ [AC_DEFINE([HAVE_TINFOW], |
| 46 |
++ [1], |
| 47 |
++ [Define if you have libtinfow])], |
| 48 |
++ [AC_MSG_FAILURE([--with-ncursesw was given, but, test for tinfow failed])])]) |
| 49 |
++ |
| 50 |
+ AS_IF([test "$with_ncursesw" = no], |
| 51 |
+ [AC_SEARCH_LIBS([initscr], [ncurses], |
| 52 |
+ [AC_DEFINE([HAVE_NCURSES], |
| 53 |
+@@ -207,6 +214,13 @@ AS_IF([test "$with_ncursesw" = no], |
| 54 |
+ [Define if you have libncurses])], |
| 55 |
+ [AC_MSG_FAILURE([the ncurses library was not found])])]) |
| 56 |
+ |
| 57 |
++AS_IF([test "$with_ncursesw" = no], |
| 58 |
++ [AC_SEARCH_LIBS([LINES], [tinfo], |
| 59 |
++ [AC_DEFINE([HAVE_TINFO], |
| 60 |
++ [1], |
| 61 |
++ [Define if you have libntinfo])], |
| 62 |
++ [AC_MSG_FAILURE([the tinfo library was not found])])]) |
| 63 |
++ |
| 64 |
+ AM_CONDITIONAL([WIDE], [test "$with_ncursesw" = yes]) |
| 65 |
+ |
| 66 |
+ AC_MSG_NOTICE([checking for term.h]) |
| 67 |
|
| 68 |
diff --git a/dev-scheme/guile-ncurses/guile-ncurses-3.0.ebuild b/dev-scheme/guile-ncurses/guile-ncurses-3.0.ebuild |
| 69 |
index 361ce458158d..9c058b78c2dc 100644 |
| 70 |
--- a/dev-scheme/guile-ncurses/guile-ncurses-3.0.ebuild |
| 71 |
+++ b/dev-scheme/guile-ncurses/guile-ncurses-3.0.ebuild |
| 72 |
@@ -23,6 +23,10 @@ BDEPEND="sys-apps/texinfo" |
| 73 |
# It's a portage's false positive. bug #677600 |
| 74 |
QA_PREBUILT='*[.]go' |
| 75 |
|
| 76 |
+PATCHES=( |
| 77 |
+ "${FILESDIR}/${P}-slibtool.patch" # 843416 |
| 78 |
+) |
| 79 |
+ |
| 80 |
src_prepare() { |
| 81 |
default |
Archives