| 1 |
flameeyes 08/12/01 18:23:05 |
| 2 |
|
| 3 |
Modified: 0.9.4-as-needed.patch |
| 4 |
Log: |
| 5 |
Replace --as-needed patch with one that solves the problem, the same as sent upstream. |
| 6 |
(Portage version: 2.2_rc16/cvs/Linux 2.6.27-gentoo-r4 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 net-wireless/crda/files/0.9.4-as-needed.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/crda/files/0.9.4-as-needed.patch?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/crda/files/0.9.4-as-needed.patch?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/crda/files/0.9.4-as-needed.patch?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: 0.9.4-as-needed.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-wireless/crda/files/0.9.4-as-needed.patch,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- 0.9.4-as-needed.patch 27 Nov 2008 15:27:25 -0000 1.1 |
| 22 |
+++ 0.9.4-as-needed.patch 1 Dec 2008 18:23:05 -0000 1.2 |
| 23 |
@@ -1,21 +1,52 @@ |
| 24 |
---- crda-0.9.4/Makefile.orig 2008-11-27 14:44:02.000000000 +0000 |
| 25 |
-+++ crda-0.9.4/Makefile 2008-11-27 14:45:59.000000000 +0000 |
| 26 |
-@@ -35,15 +35,15 @@ |
| 27 |
+Fix building with --as-needed LD flag. |
| 28 |
+ |
| 29 |
+From: Diego E. 'Flameeyes' Pettenò <flameeyes@×××××.com> |
| 30 |
+ |
| 31 |
+When using GNU ld --as-needed option, you need to ensure that the |
| 32 |
+order of parameters to the linker is formally correct, with libraries |
| 33 |
+coming after the object files. For this reason, don't use LDFLAGS for |
| 34 |
+passing the libraries, and make sure that LDLIBS goes at the end of |
| 35 |
+the line. |
| 36 |
+ |
| 37 |
+Signed-off-by: Diego E. 'Flameeyes' Pettenò <flameeyes@×××××.com> |
| 38 |
+--- |
| 39 |
+ |
| 40 |
+ Makefile | 10 +++++----- |
| 41 |
+ 1 files changed, 5 insertions(+), 5 deletions(-) |
| 42 |
+ |
| 43 |
+ |
| 44 |
+diff --git a/Makefile b/Makefile |
| 45 |
+index 91c4329..25a92fe 100644 |
| 46 |
+--- a/Makefile |
| 47 |
++++ b/Makefile |
| 48 |
+@@ -7,9 +7,9 @@ PUBKEY_DIR=pubkeys |
| 49 |
+ |
| 50 |
+ CFLAGS += -Wall -g |
| 51 |
+ #CFLAGS += -DUSE_OPENSSL `pkg-config --cflags openssl` |
| 52 |
+-#LDFLAGS += `pkg-config --libs openssl` |
| 53 |
++#LDLIBS += `pkg-config --libs openssl` |
| 54 |
+ CFLAGS += -DUSE_GCRYPT |
| 55 |
+-LDFLAGS += -lgcrypt |
| 56 |
++LDLIBS += -lgcrypt |
| 57 |
+ |
| 58 |
+ MKDIR ?= mkdir -p |
| 59 |
+ INSTALL ?= install |
| 60 |
+@@ -35,15 +35,15 @@ keys-%.c: utils/key2pub.py $(PUBKEY_DIR)/$(wildcard *.pem) |
| 61 |
|
| 62 |
crda: keys-ssl.c keys-gcrypt.c reglib.o crda.o |
| 63 |
$(NQ) ' LD ' $@ |
| 64 |
- $(Q)$(CC) $(CFLAGS) $(LDFLAGS) `pkg-config --libs libnl-1` -o $@ reglib.o crda.o |
| 65 |
-+ $(Q)$(CC) $(CFLAGS) `pkg-config --libs libnl-1` -o $@ reglib.o crda.o $(LDFLAGS) |
| 66 |
++ $(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ reglib.o crda.o `pkg-config --libs libnl-1` $(LDLIBS) |
| 67 |
|
| 68 |
regdbdump: keys-ssl.c keys-gcrypt.c reglib.o regdbdump.o |
| 69 |
$(NQ) ' LD ' $@ |
| 70 |
- $(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ reglib.o regdbdump.o |
| 71 |
-+ $(Q)$(CC) $(CFLAGS) -o $@ reglib.o regdbdump.o $(LDFLAGS) |
| 72 |
++ $(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ reglib.o regdbdump.o $(LDLIBS) |
| 73 |
|
| 74 |
intersect: keys-ssl.c keys-gcrypt.c reglib.o intersect.o |
| 75 |
$(NQ) ' LD ' $@ |
| 76 |
- $(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ reglib.o intersect.o |
| 77 |
-+ $(Q)$(CC) $(CFLAGS) -o $@ reglib.o intersect.o $(LDFLAGS) |
| 78 |
++ $(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ reglib.o intersect.o $(LDLIBS) |
| 79 |
|
| 80 |
verify: $(REG_BIN) regdbdump |
| 81 |
$(NQ) ' CHK $(REG_BIN)' |
Archives