From 3c324aeebda7eb972cbdb257a993a0ca89582612 Mon Sep 17 00:00:00 2001
From: hans <hans>
Date: Wed, 25 Apr 2012 17:52:59 +0000
Subject: Use LDFLAGS before any additional libs. Fixes an issue I had where
 the wrong libstdc++ was picked up because of -L confusion.

---
 textproc/xmlrpc-c/distinfo                         |  3 +-
 .../xmlrpc-c/patches/patch-examples_cpp_Makefile   | 36 ++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 textproc/xmlrpc-c/patches/patch-examples_cpp_Makefile

(limited to 'textproc/xmlrpc-c')

diff --git a/textproc/xmlrpc-c/distinfo b/textproc/xmlrpc-c/distinfo
index c8b96653b91..f5ef5835329 100644
--- a/textproc/xmlrpc-c/distinfo
+++ b/textproc/xmlrpc-c/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2012/03/12 15:47:12 adam Exp $
+$NetBSD: distinfo,v 1.22 2012/04/25 17:52:59 hans Exp $
 
 SHA1 (xmlrpc-c-1.16.40.tgz) = 98d4ffabee56cbf40ee82035ac8ada093be61d7e
 RMD160 (xmlrpc-c-1.16.40.tgz) = 516949aac11f4f41b53300c3dc3e29049096bd3a
@@ -10,6 +10,7 @@ SHA1 (patch-ae) = 52f826d292869be44886881c48aa7707a4af2df3
 SHA1 (patch-ai) = e7b981f07d4691bbd63bfa80b34b3e1c050c3ad2
 SHA1 (patch-aj) = e3ca062349eb7c50cf3d3dc1370744987a0f3bde
 SHA1 (patch-ak) = 2d0528260b203965e5237f5ca7f9464215283f5c
+SHA1 (patch-examples_cpp_Makefile) = 3c2ca9b50a587c6a6395aec292ca643605158171
 SHA1 (patch-lib_curl__transport_curlmulti.c) = 1cea4c43b1ed3dcf73827afc14d7bb9267371121
 SHA1 (patch-lib_curl__transport_curltransaction.c) = 1dcf46c0dd1dd8e7fdfbb6c81e00b326f6d0b1f9
 SHA1 (patch-lib_curl__transport_xmlrpc__curl__transport.c) = ea132ebb46ff0ce9893d64e9c9205d5a155220ef
diff --git a/textproc/xmlrpc-c/patches/patch-examples_cpp_Makefile b/textproc/xmlrpc-c/patches/patch-examples_cpp_Makefile
new file mode 100644
index 00000000000..6a384d0c9a2
--- /dev/null
+++ b/textproc/xmlrpc-c/patches/patch-examples_cpp_Makefile
@@ -0,0 +1,36 @@
+$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)))
+ 
-- 
cgit v1.2.3