summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEray Aslan <eras@gentoo.org>2011-06-07 13:11:08 +0000
committerEray Aslan <eras@gentoo.org>2011-06-07 13:11:08 +0000
commiteee2f540db2c9f7a03742d5806a906df259cc5d9 (patch)
tree6dc84f5bc5ae8fd73ee92b57289307b371cbe059 /net-libs/c-client/files
parentFix previous commit to put sys-apps/less in PDEPEND instead of RDEPEND. (diff)
downloadgentoo-2-eee2f540db2c9f7a03742d5806a906df259cc5d9.tar.gz
gentoo-2-eee2f540db2c9f7a03742d5806a906df259cc5d9.tar.bz2
gentoo-2-eee2f540db2c9f7a03742d5806a906df259cc5d9.zip
fix as-needed properly - bug #370421
(Portage version: 2.1.10/cvs/Linux x86_64)
Diffstat (limited to 'net-libs/c-client/files')
-rw-r--r--net-libs/c-client/files/c-client-2007e-ldflags.patch32
1 files changed, 14 insertions, 18 deletions
diff --git a/net-libs/c-client/files/c-client-2007e-ldflags.patch b/net-libs/c-client/files/c-client-2007e-ldflags.patch
index 819eda6b8756..7ca0942e3364 100644
--- a/net-libs/c-client/files/c-client-2007e-ldflags.patch
+++ b/net-libs/c-client/files/c-client-2007e-ldflags.patch
@@ -1,12 +1,18 @@
---- src/osdep/unix/Makefile~ 2010-08-08 02:30:48.000000000 -0400
-+++ src/osdep/unix/Makefile 2010-08-08 02:31:08.758000018 -0400
-@@ -959,17 +959,17 @@
+--- src/osdep/unix/Makefile~ 2011-06-07 16:04:29.000000000 +0300
++++ src/osdep/unix/Makefile 2011-06-07 15:55:31.000000000 +0300
+@@ -954,23 +954,24 @@
+
+ # Once-only environment setup
+
+-once: onceenv ckp$(PASSWDTYPE) ssl$(SSLTYPE) osdep.c
++once: ssl$(SSLTYPE) onceenv ckp$(PASSWDTYPE) osdep.c
+
onceenv:
@echo Once-only environment setup...
echo $(CC) > CCTYPE
- echo $(BASECFLAGS) '$(EXTRACFLAGS)' -DCHUNKSIZE=$(CHUNKSIZE) > CFLAGS
-+ echo `$(CAT) CFLAGS` $(BASECFLAGS) '$(EXTRACFLAGS)' -DCHUNKSIZE=$(CHUNKSIZE) > CFLAGS
- echo -DCREATEPROTO=$(CREATEPROTO) -DEMPTYPROTO=$(EMPTYPROTO) \
++ echo `$(CAT) CFLAGS` $(BASECFLAGS) '$(EXTRACFLAGS)' -DCHUNKSIZE=$(CHUNKSIZE) > CFLAGS
+ echo `$(CAT) OSCFLAGS` -DCREATEPROTO=$(CREATEPROTO) -DEMPTYPROTO=$(EMPTYPROTO) \
-DMD5ENABLE=\"$(MD5PWD)\" -DMAILSPOOL=\"$(MAILSPOOL)\" \
-DANONYMOUSHOME=\"$(MAILSPOOL)/anonymous\" \
@@ -15,23 +21,13 @@
-DLOCKPGM1=\"$(LOCKPGM1)\" -DLOCKPGM2=\"$(LOCKPGM2)\" \
-DLOCKPGM3=\"$(LOCKPGM3)\" > OSCFLAGS
- echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
++ echo `$(CAT) LDFLAGS` > LIBS
+ echo $(EXTRALDFLAGS) `$(CAT) LDFLAGS` -lcrypt $(BASELDFLAGS) > LDFLAGS
echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
- echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` `$(CAT) OSFLAGS` -shared \
-+ echo "`$(CAT) CCTYPE` `$(CAT) LDFLAGS` `$(CAT) CFLAGS` `$(CAT) OSFLAGS` -shared \
- -Wl,-soname,libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES)" \
-+ -Wl,-soname,libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES)" `$(CAT) LDFLAGS` \
++ echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` $(EXTRALDFLAGS) `$(CAT) OSFLAGS` -shared \
++ -Wl,-soname,libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES)" `$(CAT) LIBS` $(BASELDFLAGS) \
>> ARCHIVE
echo $(OS) > OSTYPE
- ./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy
---- src/osdep/unix/Makefile~ 2010-08-08 04:25:00.000000000 -0400
-+++ src/osdep/unix/Makefile 2010-08-08 04:36:49.720000021 -0400
-@@ -954,7 +954,7 @@
-
- # Once-only environment setup
-
--once: onceenv ckp$(PASSWDTYPE) ssl$(SSLTYPE) osdep.c
-+once: ssl$(SSLTYPE) onceenv ckp$(PASSWDTYPE) osdep.c
-
- onceenv:
- @echo Once-only environment setup...
+ ./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy