[csw-devel] SF.net SVN: gar:[15273] csw/mgar/pkg/libdnet/trunk/Makefile

[wahwah at users.sourceforge.net]

Revision: 15273
          http://gar.svn.sourceforge.net/gar/?rev=15273&view=rev
Author:   wahwah
Date:     2011-08-05 16:20:12 +0000 (Fri, 05 Aug 2011)

Log Message:
-----------
pkg/libdnet/trunk: worked around the missing .so issue, http://code.google.com/p/libdnet/issues/detail?id=18

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

Modified: csw/mgar/pkg/libdnet/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libdnet/trunk/Makefile	2011-08-05 13:45:43 UTC (rev 15272)
+++ csw/mgar/pkg/libdnet/trunk/Makefile	2011-08-05 16:20:12 UTC (rev 15273)
@@ -4,11 +4,6 @@
 CATEGORIES = lib
 GARTYPE = v2
 
-# ! .so extension missing http://code.google.com/p/libdnet/issues/detail?id=18
-# An idea:
-#   http://www.v7w.com/debian/libtool-missing_so.html
-#   http://www.v7w.com/debian/libtool-updating.html
-
 DESCRIPTION = A simplified, portable interface to several low-level networking routines
 define BLURB
 endef
@@ -27,8 +22,33 @@
 
 MERGE_DIRS_isa-extra = $(libdir)
 
+PACKAGES = CSWlibdnet1
+CATALOGNAME_CSWlibdnet1 = libdnet1
+PKGFILES_CSWlibdnet1 += $(call baseisadirs,$(libdir),libdnet\.so\.1\.0\.1)
+PKGFILES_CSWlibdnet1 += $(call baseisadirs,$(libdir),libdnet\.so\.1(\.\d+)*)
+SPKG_DESC_CSWlibdnet1 += A simplified, portable interface to several low-level networking routines, libdnet.so.1
+RUNTIME_DEP_PKGS_CSWlibdnet += CSWlibdnet1
+
+PACKAGES += CSWlibdnet-dev
+SPKG_DESC_CSWlibdnet-dev += $(DESCRIPTION)
+RUNTIME_DEP_PKGS_CSWlibdnet-dev += CSWlibdnet1
+
+OBSOLETED_BY_CSWlibdnet-dev = CSWlibdnet
+OBSOLETED_BY_CSWlibdnet1 = CSWlibdnet
+
 include gar/category.mk
 
+# Not sure whether it's the minimal number of steps, or whether they are in
+# a correct order, but it gets the job done.
+#
+# Workaround based on:
+#   http://www.v7w.com/debian/libtool-missing_so.html
+#   http://www.v7w.com/debian/libtool-updating.html
+#
+# Additionally, removing the old aclocal.m4 seems to be necessary.
 pre-configure-modulated:
+	rm $(WORKSRC)/aclocal.m4
+	(cd $(WORKSRC) && libtoolize --copy --force)
+	(cd $(WORKSRC) && aclocal)
 	(cd $(WORKSRC) && autoreconf -fi)
 	@$(MAKECOOKIE)


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