Gentoo Archives: gentoo-commits

From: "Jeroen Roovers (jer)" <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-admin/xstow/files: xstow-1.0.1-ncurses.patch
Date: Thu, 05 Feb 2015 10:28:45
Message-Id: 20150205102840.C6CDD1119F@oystercatcher.gentoo.org
1 jer 15/02/05 10:28:40
2
3 Modified: xstow-1.0.1-ncurses.patch
4 Log:
5 Fix linker calls (bug #538702 by Toralf Förster).
6
7 (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key A792A613)
8
9 Revision Changes Path
10 1.2 app-admin/xstow/files/xstow-1.0.1-ncurses.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/xstow/files/xstow-1.0.1-ncurses.patch?rev=1.2&view=markup
13 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
14 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
15
16 Index: xstow-1.0.1-ncurses.patch
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-admin/xstow/files/xstow-1.0.1-ncurses.patch,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- xstow-1.0.1-ncurses.patch 26 Jan 2015 18:20:44 -0000 1.1
23 +++ xstow-1.0.1-ncurses.patch 5 Feb 2015 10:28:40 -0000 1.2
24 @@ -15,6 +15,15 @@
25 AC_CHECK_HEADER([curses.h],
26 [
27 # test which libraray to use
28 +@@ -146,7 +147,7 @@
29 + fi
30 +
31 + if test $support_curses -eq 1; then
32 +- AC_SUBST(LDFLAGS_DYNAMIC, "$LDFLAGS -l$curseslib $tinfolib")
33 ++ AC_SUBST(LDFLAGS_DYNAMIC, "-l$curseslib $tinfolib")
34 + AC_DEFINE(HAVE_CURSES_H, 1, [curses library can be used])
35 + fi
36 +
37 @@ -154,8 +155,7 @@
38 [
39 support_curses=0
40 @@ -25,3 +34,23 @@
41
42 NO_STL_SSTREAM=0
43 NO_STL_STRSTREAM=0
44 +--- a/src/Makefile.am
45 ++++ b/src/Makefile.am
46 +@@ -46,7 +46,7 @@
47 + backtrace.h \
48 + backtrace.cpp
49 +
50 +-xstow_LDFLAGS= $(LDFLAGS) $(LDFLAGS_DYNAMIC)
51 ++xstow_LDADD= $(LDFLAGS_DYNAMIC)
52 +
53 + if ENABLE_MERGE
54 +
55 +@@ -63,7 +63,7 @@
56 + backtrace.h \
57 + backtrace.cpp
58 +
59 +-merge_info_LDFLAGS= $(LDFLAGS) $(LDFLAGS_DYNAMIC)
60 ++merge_info_LDADD= $(LDFLAGS_DYNAMIC)
61 +
62 + endif
63 +