* [gentoo-commits] gentoo-x86 commit in app-admin/xstow/files: xstow-1.0.1-ncurses.patch
@ 2015-01-26 18:20 Jeroen Roovers (jer)
0 siblings, 0 replies; 2+ messages in thread
From: Jeroen Roovers (jer) @ 2015-01-26 18:20 UTC (permalink / raw
To: gentoo-commits
jer 15/01/26 18:20:44
Added: xstow-1.0.1-ncurses.patch
Log:
Fix --with-curses (bug #537886).
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path
1.1 app-admin/xstow/files/xstow-1.0.1-ncurses.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/xstow/files/xstow-1.0.1-ncurses.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/xstow/files/xstow-1.0.1-ncurses.patch?rev=1.1&content-type=text/plain
Index: xstow-1.0.1-ncurses.patch
===================================================================
--- a/configure.ac
+++ b/configure.ac
@@ -91,11 +91,12 @@
AC_MSG_RESULT(disabled)
support_curses=0
else
+ AC_MSG_RESULT(enabled)
support_curses=1
fi
],
- [
- AC_MSG_RESULT(enabled)
+ [])
+if test $support_curses -eq 1; then
AC_CHECK_HEADER([curses.h],
[
# test which libraray to use
@@ -154,8 +155,7 @@
[
support_curses=0
])
- ])
-
+fi
NO_STL_SSTREAM=0
NO_STL_STRSTREAM=0
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-admin/xstow/files: xstow-1.0.1-ncurses.patch
@ 2015-02-05 10:28 Jeroen Roovers (jer)
0 siblings, 0 replies; 2+ messages in thread
From: Jeroen Roovers (jer) @ 2015-02-05 10:28 UTC (permalink / raw
To: gentoo-commits
jer 15/02/05 10:28:40
Modified: xstow-1.0.1-ncurses.patch
Log:
Fix linker calls (bug #538702 by Toralf Förster).
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path
1.2 app-admin/xstow/files/xstow-1.0.1-ncurses.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/xstow/files/xstow-1.0.1-ncurses.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/xstow/files/xstow-1.0.1-ncurses.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/xstow/files/xstow-1.0.1-ncurses.patch?r1=1.1&r2=1.2
Index: xstow-1.0.1-ncurses.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/xstow/files/xstow-1.0.1-ncurses.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xstow-1.0.1-ncurses.patch 26 Jan 2015 18:20:44 -0000 1.1
+++ xstow-1.0.1-ncurses.patch 5 Feb 2015 10:28:40 -0000 1.2
@@ -15,6 +15,15 @@
AC_CHECK_HEADER([curses.h],
[
# test which libraray to use
+@@ -146,7 +147,7 @@
+ fi
+
+ if test $support_curses -eq 1; then
+- AC_SUBST(LDFLAGS_DYNAMIC, "$LDFLAGS -l$curseslib $tinfolib")
++ AC_SUBST(LDFLAGS_DYNAMIC, "-l$curseslib $tinfolib")
+ AC_DEFINE(HAVE_CURSES_H, 1, [curses library can be used])
+ fi
+
@@ -154,8 +155,7 @@
[
support_curses=0
@@ -25,3 +34,23 @@
NO_STL_SSTREAM=0
NO_STL_STRSTREAM=0
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -46,7 +46,7 @@
+ backtrace.h \
+ backtrace.cpp
+
+-xstow_LDFLAGS= $(LDFLAGS) $(LDFLAGS_DYNAMIC)
++xstow_LDADD= $(LDFLAGS_DYNAMIC)
+
+ if ENABLE_MERGE
+
+@@ -63,7 +63,7 @@
+ backtrace.h \
+ backtrace.cpp
+
+-merge_info_LDFLAGS= $(LDFLAGS) $(LDFLAGS_DYNAMIC)
++merge_info_LDADD= $(LDFLAGS_DYNAMIC)
+
+ endif
+
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-02-05 10:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-26 18:20 [gentoo-commits] gentoo-x86 commit in app-admin/xstow/files: xstow-1.0.1-ncurses.patch Jeroen Roovers (jer)
-- strict thread matches above, loose matches on Subject: below --
2015-02-05 10:28 Jeroen Roovers (jer)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox