diff options
| author | hans <hans@pkgsrc.org> | 2012-02-28 17:37:10 +0000 |
|---|---|---|
| committer | hans <hans@pkgsrc.org> | 2012-02-28 17:37:10 +0000 |
| commit | b2d6bd852c4b7cb6cf4067e779a5cf659cc067e8 (patch) | |
| tree | 39c1b5c6c04e81544e5e80967536306983b45913 /chat | |
| parent | cee460bcc6d21ac5914cb4c0ca15b39f7398fe39 (diff) | |
| download | pkgsrc-b2d6bd852c4b7cb6cf4067e779a5cf659cc067e8.tar.gz | |
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.
Diffstat (limited to 'chat')
| -rw-r--r-- | chat/silc-client/distinfo | 4 | ||||
| -rw-r--r-- | chat/silc-client/patches/patch-ag | 14 |
2 files changed, 13 insertions, 5 deletions
diff --git a/chat/silc-client/distinfo b/chat/silc-client/distinfo index cf6690e58e1..b0a7a41eeb4 100644 --- a/chat/silc-client/distinfo +++ b/chat/silc-client/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.37 2010/02/02 23:36:16 joerg Exp $ +$NetBSD: distinfo,v 1.38 2012/02/28 17:37:10 hans Exp $ SHA1 (silc-client-1.1.8.tar.bz2) = 5936ab682e746ae413f938ce9c9b72215d6524c0 RMD160 (silc-client-1.1.8.tar.bz2) = a010384b5e498a62cc6cd69e97602f3118b64d2f @@ -9,4 +9,4 @@ SHA1 (patch-ac) = 576299d98ea63f6c42cc341bf31ad7ec903f93c8 SHA1 (patch-ad) = 490e3b2a99e14683b9a0005494d29b5a91186755 SHA1 (patch-ae) = c5b21eb9d65cb0bbc685f5e771849f1ccf07681b SHA1 (patch-af) = 29738fac989989fdd2a8865f9f5e2b3ea2ed7198 -SHA1 (patch-ag) = c40ef2f27daa410ece2026883ea0168d70feacfe +SHA1 (patch-ag) = f0700879a6780283f62bda7022e89d702876c916 diff --git a/chat/silc-client/patches/patch-ag b/chat/silc-client/patches/patch-ag index 63192c827aa..531fff598f3 100644 --- a/chat/silc-client/patches/patch-ag +++ b/chat/silc-client/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.1 2009/11/26 18:59:17 joerg Exp $ +$NetBSD: patch-ag,v 1.2 2012/02/28 17:37:10 hans Exp $ --- lib/Makefile.in.orig 2009-11-26 19:51:28.000000000 +0100 +++ lib/Makefile.in -@@ -643,8 +643,6 @@ install-exec-hook: +@@ -643,14 +643,12 @@ install-exec-hook: @SILC_ENABLE_SHARED_TRUE@ -mkdir -p $(libdir) @SILC_ENABLE_SHARED_TRUE@ -$(LIBTOOL) --mode=install $(INSTALL) libsilc.la $(DESTDIR)$(libdir)/ @SILC_ENABLE_SHARED_TRUE@ -$(LIBTOOL) --mode=install $(INSTALL) libsilcclient.la $(DESTDIR)$(libdir)/ @@ -10,4 +10,12 @@ $NetBSD: patch-ag,v 1.1 2009/11/26 18:59:17 joerg Exp $ -@SILC_ENABLE_SHARED_TRUE@ -rm -rf $(DESTDIR)$(libdir)/libsilcclient.a 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 +- 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` + + install-data-hook: + |