diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2008-12-01 18:23:05 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2008-12-01 18:23:05 +0000 |
| commit | 26e5971999c4a87500bd4df58fb86d1b379bc750 (patch) | |
| tree | 8831d84df93124399c5c6d8b7caf4bdff51ccf56 /net-wireless | |
| parent | Version bump; use tarball rather than gem: the installed package is smaller, ... (diff) | |
| download | historical-26e5971999c4a87500bd4df58fb86d1b379bc750.tar.gz historical-26e5971999c4a87500bd4df58fb86d1b379bc750.tar.bz2 historical-26e5971999c4a87500bd4df58fb86d1b379bc750.zip | |
Replace --as-needed patch with one that solves the problem, the same as sent upstream.
Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.27-gentoo-r4 x86_64
Diffstat (limited to 'net-wireless')
| -rw-r--r-- | net-wireless/crda/ChangeLog | 7 | ||||
| -rw-r--r-- | net-wireless/crda/Manifest | 10 | ||||
| -rw-r--r-- | net-wireless/crda/files/0.9.4-as-needed.patch | 43 |
3 files changed, 48 insertions, 12 deletions
diff --git a/net-wireless/crda/ChangeLog b/net-wireless/crda/ChangeLog index 96cafbe32fed..9a7c9763b34e 100644 --- a/net-wireless/crda/ChangeLog +++ b/net-wireless/crda/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-wireless/crda # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/ChangeLog,v 1.2 2008/12/01 14:06:51 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/ChangeLog,v 1.3 2008/12/01 18:23:05 flameeyes Exp $ + + 01 Dec 2008; Diego E. Pettenò <flameeyes@gentoo.org> + files/0.9.4-as-needed.patch: + Replace --as-needed patch with one that solves the problem, the same as + sent upstream. 01 Dec 2008; <chainsaw@gentoo.org> crda-0.9.4.ebuild: Force -j1 as the current Makefile is not safe for parallel building, diff --git a/net-wireless/crda/Manifest b/net-wireless/crda/Manifest index 1939e107f06e..5f903742d5a4 100644 --- a/net-wireless/crda/Manifest +++ b/net-wireless/crda/Manifest @@ -1,15 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX 0.9.4-as-needed.patch 841 RMD160 bd9c84c4a3b6e0a574c706f419d7979a77b558ba SHA1 da4f1c93ea8469c72e5bfbf44fbbb52754033a24 SHA256 811d161b0fde10e0a4cb18c67a3d127b8561c3079a66b70849eea3b266427982 +AUX 0.9.4-as-needed.patch 1734 RMD160 294e07d803b79575251b8a07e116ed15e7585a0a SHA1 9410b18ead6880e6b3cb5ac1ebec9d08e879f38f SHA256 8408a87ed3565951fd6aa22b8d98c15f2ca64135177916802e5d48efbe53994e DIST crda-0.9.4.tar.bz2 17498 RMD160 b251207c485b5f4491e3430bb0853c623468c0da SHA1 fabe7b81572956b7854935ed936adf5092c52d8f SHA256 a87b7e1695f1b5d36523f1a81c60a17af245b021c88f879679333c522a5c7c59 EBUILD crda-0.9.4.ebuild 854 RMD160 c7f26a89092c1fe8a3cfa000d154d990ccaad9c9 SHA1 8b278b3161cd7919d323353adaecfd23b52d9e52 SHA256 5558748950c9ae903de651f4d0fd2d26287dcdc23fd35d5e17e137010004d9f7 -MISC ChangeLog 697 RMD160 6e2e23ff91013a826c431ceb06d01ebcec33e3ab SHA1 f33c42a66cdcc3a54423c8665ddd262a71ac3288 SHA256 544d5754ac8a061222d335cd0c7b31d154001ba2cacc2fcc0ef35b503636f081 +MISC ChangeLog 877 RMD160 8a668088af6dede42d2a3e2bdae3e44d0f087acc SHA1 0735d3cae0a760a0f55431c52718148cb3e64f1e SHA256 884b5bf77a04444a1e94646b359b5966f2a8c3524927217708ed7e33f5304e6b MISC metadata.xml 364 RMD160 adcf6081e77d8749f51ec93050a6a347a94cb831 SHA1 acbeae19248448df44b61c33444b57fc009e4da5 SHA256 2c2588cd2313a0575d012ffae9b88c7f57647f2eb46fb27718dbc1ef37e6ba97 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkkz73IACgkQp5vW4rUFj5ooWwCdFe9el0VT6aScKghU/FjCKKIv -nTUAoJYRq1Uz37OidQKeXZwOS397wIpy -=NJzX +iEYEARECAAYFAkk0K44ACgkQAiZjviIA2Xh6zACeMuZSESXnv2pouSSmUQe0reIk +CWUAnjiTgBtvqgJLbisBli2knwweUhaP +=q2Zy -----END PGP SIGNATURE----- diff --git a/net-wireless/crda/files/0.9.4-as-needed.patch b/net-wireless/crda/files/0.9.4-as-needed.patch index d9ef0bd6a808..d1ec507477f4 100644 --- a/net-wireless/crda/files/0.9.4-as-needed.patch +++ b/net-wireless/crda/files/0.9.4-as-needed.patch @@ -1,21 +1,52 @@ ---- crda-0.9.4/Makefile.orig 2008-11-27 14:44:02.000000000 +0000 -+++ crda-0.9.4/Makefile 2008-11-27 14:45:59.000000000 +0000 -@@ -35,15 +35,15 @@ +Fix building with --as-needed LD flag. + +From: Diego E. 'Flameeyes' Pettenò <flameeyes@gmail.com> + +When using GNU ld --as-needed option, you need to ensure that the +order of parameters to the linker is formally correct, with libraries +coming after the object files. For this reason, don't use LDFLAGS for +passing the libraries, and make sure that LDLIBS goes at the end of +the line. + +Signed-off-by: Diego E. 'Flameeyes' Pettenò <flameeyes@gmail.com> +--- + + Makefile | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + + +diff --git a/Makefile b/Makefile +index 91c4329..25a92fe 100644 +--- a/Makefile ++++ b/Makefile +@@ -7,9 +7,9 @@ PUBKEY_DIR=pubkeys + + CFLAGS += -Wall -g + #CFLAGS += -DUSE_OPENSSL `pkg-config --cflags openssl` +-#LDFLAGS += `pkg-config --libs openssl` ++#LDLIBS += `pkg-config --libs openssl` + CFLAGS += -DUSE_GCRYPT +-LDFLAGS += -lgcrypt ++LDLIBS += -lgcrypt + + MKDIR ?= mkdir -p + INSTALL ?= install +@@ -35,15 +35,15 @@ keys-%.c: utils/key2pub.py $(PUBKEY_DIR)/$(wildcard *.pem) crda: keys-ssl.c keys-gcrypt.c reglib.o crda.o $(NQ) ' LD ' $@ - $(Q)$(CC) $(CFLAGS) $(LDFLAGS) `pkg-config --libs libnl-1` -o $@ reglib.o crda.o -+ $(Q)$(CC) $(CFLAGS) `pkg-config --libs libnl-1` -o $@ reglib.o crda.o $(LDFLAGS) ++ $(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ reglib.o crda.o `pkg-config --libs libnl-1` $(LDLIBS) regdbdump: keys-ssl.c keys-gcrypt.c reglib.o regdbdump.o $(NQ) ' LD ' $@ - $(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ reglib.o regdbdump.o -+ $(Q)$(CC) $(CFLAGS) -o $@ reglib.o regdbdump.o $(LDFLAGS) ++ $(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ reglib.o regdbdump.o $(LDLIBS) intersect: keys-ssl.c keys-gcrypt.c reglib.o intersect.o $(NQ) ' LD ' $@ - $(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ reglib.o intersect.o -+ $(Q)$(CC) $(CFLAGS) -o $@ reglib.o intersect.o $(LDFLAGS) ++ $(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ reglib.o intersect.o $(LDLIBS) verify: $(REG_BIN) regdbdump $(NQ) ' CHK $(REG_BIN)' |