1 |
commit: a146e78296f239a43494151b1665989dc1113df6 |
2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 27 23:37:42 2013 +0000 |
4 |
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 27 23:37:42 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=a146e782 |
7 |
|
8 |
Fix build failure with separate tinfo library, bug 459458. |
9 |
|
10 |
--- |
11 |
emacs/23.4/14_all_ncurses-tinfo.patch | 31 +++++++++++++++++++++++++++++ |
12 |
emacs/24.2/08_all_ncurses-tinfo.patch | 35 +++++++++++++++++++++++++++++++++ |
13 |
2 files changed, 66 insertions(+), 0 deletions(-) |
14 |
|
15 |
diff --git a/emacs/23.4/14_all_ncurses-tinfo.patch b/emacs/23.4/14_all_ncurses-tinfo.patch |
16 |
new file mode 100644 |
17 |
index 0000000..7cd6165 |
18 |
--- /dev/null |
19 |
+++ b/emacs/23.4/14_all_ncurses-tinfo.patch |
20 |
@@ -0,0 +1,31 @@ |
21 |
+Fix runtime failure if built with separate tinfo library. |
22 |
+https://bugs.gentoo.org/459458 |
23 |
+ |
24 |
+--- emacs-23.4-orig/configure.in |
25 |
++++ emacs-23.4/configure.in |
26 |
+@@ -2391,7 +2391,13 @@ |
27 |
+ # That is because we have not set up to link ncurses in lib-src. |
28 |
+ # It's better to believe a function is not available |
29 |
+ # than to expect to find it in ncurses. |
30 |
+-AC_CHECK_LIB(ncurses, tparm) |
31 |
++AC_SEARCH_LIBS(tparm, [ncurses tinfo], |
32 |
++ [AC_DEFINE(HAVE_LIBNCURSES, 1, |
33 |
++ [Define to 1 if you have the ncurses or tinfo library.])]) |
34 |
++if test "$ac_cv_search_tparm" = "-ltinfo"; then |
35 |
++ LIBS_TINFO="-ltinfo" |
36 |
++fi |
37 |
++AC_SUBST(LIBS_TINFO) |
38 |
+ |
39 |
+ case "$opsys" in |
40 |
+ netbsd) |
41 |
+--- emacs-23.4-orig/src/Makefile.in |
42 |
++++ emacs-23.4/src/Makefile.in |
43 |
+@@ -919,7 +919,7 @@ |
44 |
+ with GCC, we might need gnulib again after them. */ |
45 |
+ |
46 |
+ LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(LIBSOUND) $(RSVG_LIBS) $(DBUS_LIBS) \ |
47 |
+- LIBGPM LIBRESOLV LIBS_SYSTEM LIBS_MACHINE LIBS_TERMCAP \ |
48 |
++ LIBGPM LIBRESOLV LIBS_SYSTEM LIBS_MACHINE LIBS_TERMCAP @LIBS_TINFO@ \ |
49 |
+ LIBS_DEBUG $(GETLOADAVG_LIBS) ${GCONF_LIBS} \ |
50 |
+ @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @LIBOTF_LIBS@ @M17N_FLT_LIBS@ \ |
51 |
+ $(GNULIB_VAR) LIB_MATH LIB_STANDARD $(GNULIB_VAR) |
52 |
|
53 |
diff --git a/emacs/24.2/08_all_ncurses-tinfo.patch b/emacs/24.2/08_all_ncurses-tinfo.patch |
54 |
new file mode 100644 |
55 |
index 0000000..e4a6117 |
56 |
--- /dev/null |
57 |
+++ b/emacs/24.2/08_all_ncurses-tinfo.patch |
58 |
@@ -0,0 +1,35 @@ |
59 |
+Fix build failure with separate tinfo library. |
60 |
+Patch taken from upstream bzr (emacs-24 branch) and backported to 24.2. |
61 |
+https://bugs.gentoo.org/459458 |
62 |
+http://debbugs.gnu.org/9741 |
63 |
+ |
64 |
+--- emacs-24.2-orig/configure.in |
65 |
++++ emacs-24.2/configure.in |
66 |
+@@ -2813,7 +2813,7 @@ |
67 |
+ ]) |
68 |
+ # Maybe curses should be tried earlier? |
69 |
+ # See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9736#35 |
70 |
+-for tputs_library in '' ncurses terminfo termcap curses; do |
71 |
++for tputs_library in '' tinfo ncurses terminfo termcap curses; do |
72 |
+ OLIBS=$LIBS |
73 |
+ if test -z "$tputs_library"; then |
74 |
+ LIBS_TERMCAP= |
75 |
+@@ -2833,7 +2833,8 @@ |
76 |
+ AC_MSG_RESULT([$msg]) |
77 |
+ if test "X$msg" = Xno; then |
78 |
+ AC_MSG_ERROR([The required function `tputs' was not found in any library. |
79 |
+-These libraries were tried: libncurses, libterminfo, libtermcap, libcurses. |
80 |
++The following libraries were tried (in order): |
81 |
++ libtinfo, libncurses, libterminfo, libtermcap, libcurses |
82 |
+ Please try installing whichever of these libraries is most appropriate |
83 |
+ for your system, together with its header files. |
84 |
+ For example, a libncurses-dev(el) or similar package.]) |
85 |
+@@ -2865,7 +2866,7 @@ |
86 |
+ ## (HAVE_LIBNCURSES was not always true, but is since 2010-03-18.) |
87 |
+ if test "x$HAVE_LIBNCURSES" = "xyes"; then |
88 |
+ TERMINFO=yes |
89 |
+- LIBS_TERMCAP="-lncurses" |
90 |
++ test -z "$LIBS_TERMCAP" && LIBS_TERMCAP="-lncurses" |
91 |
+ fi |
92 |
+ ;; |
93 |
+ |