SF.net SVN: gar:[23150] csw/mgar/pkg/silctoolkit/trunk

[dmichelsen at users.sourceforge.net]

Revision: 23150
          http://sourceforge.net/p/gar/code/23150
Author:   dmichelsen
Date:     2014-03-07 13:58:47 +0000 (Fri, 07 Mar 2014)
Log Message:
-----------
silctoolkit/trunk: Major build fixes for 64 bit and self-containedness

Modified Paths:
--------------
    csw/mgar/pkg/silctoolkit/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/silctoolkit/trunk/files/0001-xargs-splits-into-multiple-invocations-make-sure-to-.patch

Modified: csw/mgar/pkg/silctoolkit/trunk/Makefile
===================================================================
--- csw/mgar/pkg/silctoolkit/trunk/Makefile	2014-03-07 13:55:39 UTC (rev 23149)
+++ csw/mgar/pkg/silctoolkit/trunk/Makefile	2014-03-07 13:58:47 UTC (rev 23150)
@@ -17,6 +17,8 @@
 PATCHFILES += function.patch
 PATCHFILES += 0002-linking-lacks-LDFLAGS.patch
 
+PATCHFILES += 0001-xargs-splits-into-multiple-invocations-make-sure-to-.patch
+
 VENDOR_URL = http://silcnet.org/software/download/toolkit/
 
 # This is the same as what Debian used to do:
@@ -26,7 +28,7 @@
 PACKAGES += CSWlibsilc1-1-2
 SPKG_DESC_CSWlibsilc1-1-2 = Secure internet live conferencing toolkit, libsilc-1.1.so.2
 PKGFILES_CSWlibsilc1-1-2 += $(call pkgfiles_lib,libsilc-1.1.so.2)
-PKGFILES_CSWlibsilc1-1-2 += $(call baseisadirs,$(libdir)/silc,.*)
+PKGFILES_CSWlibsilc1-1-2 += $(call baseisadirs,$(libdir),silc/.*)
 
 OBSOLETED_BY_CSWlibsilc1-1-2 += CSWsilctoolkit
 
@@ -50,6 +52,9 @@
 
 BUILD64 = 1
 
+# These are at least needed for libsilc.so
+EXTRA_LIBS += -lsocket -lnsl -liconv
+
 # Avoid a collision between its client.h and Samba's
 includedir = $(prefix)/include/silc
 

Added: csw/mgar/pkg/silctoolkit/trunk/files/0001-xargs-splits-into-multiple-invocations-make-sure-to-.patch
===================================================================
--- csw/mgar/pkg/silctoolkit/trunk/files/0001-xargs-splits-into-multiple-invocations-make-sure-to-.patch	                        (rev 0)
+++ csw/mgar/pkg/silctoolkit/trunk/files/0001-xargs-splits-into-multiple-invocations-make-sure-to-.patch	2014-03-07 13:58:47 UTC (rev 23150)
@@ -0,0 +1,31 @@
+From a287c9cbd150be9a079f725f4ca803cc347c3ac1 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 7 Mar 2014 14:49:29 +0100
+Subject: [PATCH] xargs splits into multiple invocations, make sure to use only
+ one libtool invocation
+
+---
+ lib/Makefile.in | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/lib/Makefile.in b/lib/Makefile.in
+index ec94aaf..850e0d7 100644
+--- a/lib/Makefile.in
++++ b/lib/Makefile.in
+@@ -678,10 +678,11 @@ 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
+-- 
+1.8.4.1
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.