Gentoo Archives: gentoo-commits

From: "Diego Petteno (flameeyes)" <flameeyes@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/xrdp/files: xrdp-0.4.1-asneeded.patch
Date: Mon, 05 Apr 2010 14:06:52
Message-Id: 20100405140649.B885A2C04A@corvid.gentoo.org
1 flameeyes 10/04/05 14:06:49
2
3 Modified: xrdp-0.4.1-asneeded.patch
4 Log:
5 Fix --as-needed patching to work on both x86 and amd64.
6 (Portage version: 2.2_rc67/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.2 net-misc/xrdp/files/xrdp-0.4.1-asneeded.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/xrdp/files/xrdp-0.4.1-asneeded.patch?rev=1.2&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/xrdp/files/xrdp-0.4.1-asneeded.patch?rev=1.2&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/xrdp/files/xrdp-0.4.1-asneeded.patch?r1=1.1&r2=1.2
14
15 Index: xrdp-0.4.1-asneeded.patch
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/net-misc/xrdp/files/xrdp-0.4.1-asneeded.patch,v
18 retrieving revision 1.1
19 retrieving revision 1.2
20 diff -u -r1.1 -r1.2
21 --- xrdp-0.4.1-asneeded.patch 21 Dec 2009 14:09:33 -0000 1.1
22 +++ xrdp-0.4.1-asneeded.patch 5 Apr 2010 14:06:49 -0000 1.2
23 @@ -3,9 +3,9 @@
24 @@ -14,17 +14,18 @@
25 DEFINES = -DLIBSCP_CLIENT
26
27 - CFLAGS += -I../../common -I../ -I/usr/include/nptl -I../libscp $(DEFINES)
28 --LDFLAGS = -L/usr/gnu/lib -L/usr/lib64/nptl -L../libscp -Wl,-rpath,/usr/lib64/xrdp -lpthread -ldl -lscp
29 -+LDFLAGS = -L/usr/gnu/lib -L/usr/lib64/nptl -L../libscp -Wl,-rpath,/usr/lib64/xrdp
30 + CFLAGS = -Wall -O2 -I../../common -I../ -I/usr/include/nptl -I../libscp $(DEFINES)
31 +-LDFLAGS = -L/usr/gnu/lib -L/usr/lib/nptl -L../libscp -Wl,-rpath,. -lpthread -ldl -lscp
32 ++LDFLAGS = -L/usr/gnu/lib -L/usr/lib/nptl -L../libscp -Wl,-rpath,.
33 +LIBS = -lpthread -ldl -lscp
34 C_OS_FLAGS = $(CFLAGS) -c
35 CC = gcc
36 @@ -27,9 +27,9 @@
37 @@ -18,7 +18,8 @@
38 -DSESMAN_DESTDIR=\"$(DESTDIR)\"
39
40 - CFLAGS += -I../common -I/usr/include/nptl -I./libscp $(DEFINES)
41 --LDFLAGS = -L/usr/gnu/lib -L/usr/lib64/nptl -L./libscp -Wl,-rpath,/usr/lib64/xrdp -lpthread -ldl -lscp
42 -+LDFLAGS = -L/usr/gnu/lib -L/usr/lib64/nptl -L./libscp -Wl,-rpath,/usr/lib64/xrdp
43 + CFLAGS = -Wall -O2 -I../common -I/usr/include/nptl -I./libscp $(DEFINES)
44 +-LDFLAGS = -L/usr/gnu/lib -L/usr/lib/nptl -L./libscp -Wl,-rpath,. -lpthread -ldl -lscp
45 ++LDFLAGS = -L/usr/gnu/lib -L/usr/lib/nptl -L./libscp -Wl,-rpath,.
46 +LIBS=-lpthread -ldl -lscp
47 C_OS_FLAGS = $(CFLAGS) -c
48 CC = gcc