Wed Apr 25 17:53:00 2012 UTC ()
Use LDFLAGS before any additional libs. Fixes an issue I had where the
wrong libstdc++ was picked up because of -L confusion.


(hans)
diff -r1.21 -r1.22 pkgsrc/textproc/xmlrpc-c/distinfo
diff -r0 -r1.1 pkgsrc/textproc/xmlrpc-c/patches/patch-examples_cpp_Makefile
cvs diff -r1.21 -r1.22 pkgsrc/textproc/xmlrpc-c/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/xmlrpc-c/distinfo 2012/03/12 15:47:12 1.21
+++ pkgsrc/textproc/xmlrpc-c/distinfo 2012/04/25 17:52:59 1.22
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1$NetBSD: distinfo,v 1.21 2012/03/12 15:47:12 adam Exp $ 1$NetBSD: distinfo,v 1.22 2012/04/25 17:52:59 hans Exp $
2 2
3SHA1 (xmlrpc-c-1.16.40.tgz) = 98d4ffabee56cbf40ee82035ac8ada093be61d7e 3SHA1 (xmlrpc-c-1.16.40.tgz) = 98d4ffabee56cbf40ee82035ac8ada093be61d7e
4RMD160 (xmlrpc-c-1.16.40.tgz) = 516949aac11f4f41b53300c3dc3e29049096bd3a 4RMD160 (xmlrpc-c-1.16.40.tgz) = 516949aac11f4f41b53300c3dc3e29049096bd3a
5Size (xmlrpc-c-1.16.40.tgz) = 754491 bytes 5Size (xmlrpc-c-1.16.40.tgz) = 754491 bytes
6SHA1 (patch-GNUmakefile) = 3edcf5ef38c9e94466d0303cb0eb7ce2d5ca39bb 6SHA1 (patch-GNUmakefile) = 3edcf5ef38c9e94466d0303cb0eb7ce2d5ca39bb
7SHA1 (patch-aa) = 96ca1b0f8550b04e7292d07b4204b5bed841a417 7SHA1 (patch-aa) = 96ca1b0f8550b04e7292d07b4204b5bed841a417
8SHA1 (patch-ac) = e230eb36f812c85521721ead4d080250e61f670f 8SHA1 (patch-ac) = e230eb36f812c85521721ead4d080250e61f670f
9SHA1 (patch-ae) = 52f826d292869be44886881c48aa7707a4af2df3 9SHA1 (patch-ae) = 52f826d292869be44886881c48aa7707a4af2df3
10SHA1 (patch-ai) = e7b981f07d4691bbd63bfa80b34b3e1c050c3ad2 10SHA1 (patch-ai) = e7b981f07d4691bbd63bfa80b34b3e1c050c3ad2
11SHA1 (patch-aj) = e3ca062349eb7c50cf3d3dc1370744987a0f3bde 11SHA1 (patch-aj) = e3ca062349eb7c50cf3d3dc1370744987a0f3bde
12SHA1 (patch-ak) = 2d0528260b203965e5237f5ca7f9464215283f5c 12SHA1 (patch-ak) = 2d0528260b203965e5237f5ca7f9464215283f5c
 13SHA1 (patch-examples_cpp_Makefile) = 3c2ca9b50a587c6a6395aec292ca643605158171
13SHA1 (patch-lib_curl__transport_curlmulti.c) = 1cea4c43b1ed3dcf73827afc14d7bb9267371121 14SHA1 (patch-lib_curl__transport_curlmulti.c) = 1cea4c43b1ed3dcf73827afc14d7bb9267371121
14SHA1 (patch-lib_curl__transport_curltransaction.c) = 1dcf46c0dd1dd8e7fdfbb6c81e00b326f6d0b1f9 15SHA1 (patch-lib_curl__transport_curltransaction.c) = 1dcf46c0dd1dd8e7fdfbb6c81e00b326f6d0b1f9
15SHA1 (patch-lib_curl__transport_xmlrpc__curl__transport.c) = ea132ebb46ff0ce9893d64e9c9205d5a155220ef 16SHA1 (patch-lib_curl__transport_xmlrpc__curl__transport.c) = ea132ebb46ff0ce9893d64e9c9205d5a155220ef
File Added: pkgsrc/textproc/xmlrpc-c/patches/Attic/patch-examples_cpp_Makefile
$NetBSD: patch-examples_cpp_Makefile,v 1.1 2012/04/25 17:52:59 hans Exp $

--- examples/cpp/Makefile.orig	2011-03-25 17:58:35.000000000 +0100
+++ examples/cpp/Makefile	2012-04-25 17:31:34.833338175 +0200
@@ -75,26 +75,26 @@ LIBS_BASE = \
 all: $(PROGS)
 
 $(SERVERPROGS_CGI):%.cgi:%_cgi.o
-	$(CXXLD) -o $@ $^ $(LIBS_SERVER_CGI) $(LDFLAGS)
+	$(CXXLD) -o $@ $(LDFLAGS) $^ $(LIBS_SERVER_CGI)
 
 $(SERVERPROGS_ABYSS):%:%.o
-	$(CXXLD) -o $@ $^ $(LIBS_SERVER_ABYSS) $(LDFLAGS)
+	$(CXXLD) -o $@ $(LDFLAGS) $^ $(LIBS_SERVER_ABYSS)
 
 $(CLIENTPROGS):%:%.o
-	$(CXXLD) -o $@ $^ $(LIBS_CLIENT) $(LDFLAGS)
+	$(CXXLD) -o $@ $(LDFLAGS) $^ $(LIBS_CLIENT)
 
 
 LIBS_PSTREAM_CLIENT = \
   $(shell $(XMLRPC_C_CONFIG) c++2 client --libs)
 
 pstream_client:%:%.o
-	$(CXXLD) -o $@ $^ $(LIBS_PSTREAM_CLIENT) $(LDFLAGS)
+	$(CXXLD) -o $@ $(LDFLAGS) $^ $(LIBS_PSTREAM_CLIENT)
 
 LIBS_PSTREAM_SERVER = \
   $(shell $(XMLRPC_C_CONFIG) c++2 pstream-server --libs)
 
 pstream_inetd_server:%:%.o
-	$(CXXLD) -o $@ $^ $(LIBS_PSTREAM_SERVER) $(LDFLAGS)
+	$(CXXLD) -o $@ $(LDFLAGS) $^ $(LIBS_PSTREAM_SERVER)
 
 OBJECTS = $(patsubst %,%.o,$(patsubst %.cgi,%_cgi,$(PROGS)))