Gentoo Archives: gentoo-commits

From: "Sergey Popov (pinkbyte)" <pinkbyte@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-dialup/xc/files: xc-4.3.2-gentoo.patch
Date: Sat, 02 Mar 2013 17:25:38
Message-Id: 20130302172535.9D8362171E@flycatcher.gentoo.org
1 pinkbyte 13/03/02 17:25:35
2
3 Modified: xc-4.3.2-gentoo.patch
4 Log:
5 Revision bump: respect AR and RANLIB, fix building with sys-libs/ncurses[tinfo] wrt bug #459796
6
7 (Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)
8
9 Revision Changes Path
10 1.3 net-dialup/xc/files/xc-4.3.2-gentoo.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/xc/files/xc-4.3.2-gentoo.patch?rev=1.3&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/xc/files/xc-4.3.2-gentoo.patch?rev=1.3&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/xc/files/xc-4.3.2-gentoo.patch?r1=1.2&r2=1.3
15
16 Index: xc-4.3.2-gentoo.patch
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-dialup/xc/files/xc-4.3.2-gentoo.patch,v
19 retrieving revision 1.2
20 retrieving revision 1.3
21 diff -u -r1.2 -r1.3
22 --- xc-4.3.2-gentoo.patch 31 Jan 2010 06:21:06 -0000 1.2
23 +++ xc-4.3.2-gentoo.patch 2 Mar 2013 17:25:35 -0000 1.3
24 @@ -37,7 +37,7 @@
25
26 INSTALL = install
27 -LDFLAGS = -ltermcap editline/libedit.a
28 -+LIBS = -lncurses editline/libedit.a
29 ++LIBS += -lncurses editline/libedit.a
30 NROFF = groff -mandoc
31
32 # defines for use with cextract under Linux
33 @@ -101,3 +101,22 @@
34 if (argc > 1) {
35 if (!strcmp(argv[1], "-x")) {
36 Block = 128;
37 +--- xc-4.3.2/editline/Makefile.orig 2013-03-02 21:15:29.667344872 +0400
38 ++++ xc-4.3.2/editline/Makefile 2013-03-02 21:15:38.434344313 +0400
39 +@@ -34,7 +34,7 @@
40 + LDFLAGS = -ltermcap
41 +
42 + ## Set ranlib as appropriate:
43 +-RANLIB = ranlib
44 ++RANLIB ?= ranlib
45 + #RANLIB = echo
46 +
47 + ## End of configuration.
48 +@@ -70,6 +70,6 @@
49 +
50 + libedit.a: $(OBJECTS)
51 + @rm -f $@
52 +- ar r $@ $(OBJECTS)
53 ++ $(AR) r $@ $(OBJECTS)
54 + $(RANLIB) $@
55 +