Don't use xargs when creating the libraries. This can result in xargs

invoking libtool twice, creating a library with most of the objects
missing.

3 files changed, 41 insertions, 1 deletions

diff --git a/devel/silc-toolkit/distinfo b/devel/silc-toolkit/distinfo
index d6bdf489c9c..a1c0a4ac395 100644
--- a/devel/silc-toolkit/distinfo
+++ b/devel/silc-toolkit/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.6 2010/08/30 11:17:16 adam Exp $
+$NetBSD: distinfo,v 1.7 2012/02/28 17:26:29 hans Exp $
 
 SHA1 (silc-toolkit-1.1.10.tar.bz2) = 0bd4b1b410424733687fd2ad33c1b09cbbf8673f
 RMD160 (silc-toolkit-1.1.10.tar.bz2) = 9a505420569e8595eaee684c2e4bde7e4570654d
 Size (silc-toolkit-1.1.10.tar.bz2) = 1830280 bytes
+SHA1 (patch-lib_Makefile.am) = 87f9a0d450f3dc3a51a6bc7856b395df1281b475
+SHA1 (patch-lib_Makefile.in) = 79c11f6b3057cafbe68fab47fb7e4b4fb50fb1f9
diff --git a/devel/silc-toolkit/patches/patch-lib_Makefile.am b/devel/silc-toolkit/patches/patch-lib_Makefile.am
new file mode 100644
index 00000000000..87ad152debc
--- /dev/null
+++ b/devel/silc-toolkit/patches/patch-lib_Makefile.am
@@ -0,0 +1,21 @@
+$NetBSD: patch-lib_Makefile.am,v 1.1 2012/02/28 17:26:29 hans Exp $
+
+--- lib/Makefile.am.orig	2009-08-07 13:51:26.000000000 +0200
++++ lib/Makefile.am	2012-02-28 18:13:23.369079034 +0100
+@@ -82,14 +82,14 @@ LIBSILC_REVISION=@LIBSILC_REVISION@
+ LIBSILC_AGE=@LIBSILC_AGE@
+ 
+ libsilc.a:
+-	find $(SILCLIB_DIRS) -type f -name *.lo | xargs	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(SILC_LINK_LIBS)	$(LIBTOOL_SILC_VERSION)	$(LIBTOOL_OPTS) -o libsilc.la
++	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(SILC_LINK_LIBS)	$(LIBTOOL_SILC_VERSION)	$(LIBTOOL_OPTS) -o libsilc.la `find $(SILCLIB_DIRS) -type f -name *.lo`
+ 
+ LIBSILCCLIENT_CURRENT=@LIBSILCCLIENT_CURRENT@
+ LIBSILCCLIENT_REVISION=@LIBSILCCLIENT_REVISION@
+ LIBSILCCLIENT_AGE=@LIBSILCCLIENT_AGE@
+ 
+ libsilcclient.a:
+-	find $(SILCCLIENTLIB_DIRS) -type f -name *.lo | xargs	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS)	$(SILCCLIENT_LINK_LIBS) $(LIBTOOL_SILCCLIENT_VERSION)	$(LIBTOOL_OPTS) -o libsilcclient.la
++	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS)	$(SILCCLIENT_LINK_LIBS) $(LIBTOOL_SILCCLIENT_VERSION)	$(LIBTOOL_OPTS) -o libsilcclient.la `find $(SILCCLIENTLIB_DIRS) -type f -name *.lo`
+ 
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
diff --git a/devel/silc-toolkit/patches/patch-lib_Makefile.in b/devel/silc-toolkit/patches/patch-lib_Makefile.in
new file mode 100644
index 00000000000..9e4d149b061
--- /dev/null
+++ b/devel/silc-toolkit/patches/patch-lib_Makefile.in
@@ -0,0 +1,17 @@
+$NetBSD: patch-lib_Makefile.in,v 1.1 2012/02/28 17:26:29 hans Exp $
+
+--- lib/Makefile.in.orig	2009-08-07 13:51:30.000000000 +0200
++++ lib/Makefile.in	2012-02-28 18:15:14.847802539 +0100
+@@ -678,10 +678,10 @@ install-exec-hook:
+ 	-$(LIBTOOL) --mode=install $(INSTALL) libsilcclient.la $(DESTDIR)$(libdir)/
+ 
+ libsilc.a:
+-	find $(SILCLIB_DIRS) -type f -name *.lo | xargs	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(SILC_LINK_LIBS)	$(LIBTOOL_SILC_VERSION)	$(LIBTOOL_OPTS) -o libsilc.la
++	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(SILC_LINK_LIBS)	$(LIBTOOL_SILC_VERSION)	$(LIBTOOL_OPTS) -o libsilc.la `find $(SILCLIB_DIRS) -type f -name *.lo`
+ 
+ libsilcclient.a:
+-	find $(SILCCLIENTLIB_DIRS) -type f -name *.lo | xargs	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS)	$(SILCCLIENT_LINK_LIBS) $(LIBTOOL_SILCCLIENT_VERSION)	$(LIBTOOL_OPTS) -o libsilcclient.la
++	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS)	$(SILCCLIENT_LINK_LIBS) $(LIBTOOL_SILCCLIENT_VERSION)	$(LIBTOOL_OPTS) -o libsilcclient.la `find $(SILCCLIENTLIB_DIRS) -type f -name *.lo`
+ toolkit-install:
+ 	-mkdir -p $(docdir)/toolkit/
+ 	-$(INSTALL_DATA) $(top_srcdir)/doc/toolkit/* $(docdir)/toolkit