[csw-devel] SF.net SVN: gar:[13695] csw/mgar/pkg/libtool/branches/libtool24/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 13695
          http://gar.svn.sourceforge.net/gar/?rev=13695&view=rev
Author:   dmichelsen
Date:     2011-03-08 21:27:29 +0000 (Tue, 08 Mar 2011)

Log Message:
-----------
libtool24: Reorganize package description and make CSWlibtool also directly depend on CSWlibltdl3 to fix #4722

Modified Paths:
--------------
    csw/mgar/pkg/libtool/branches/libtool24/Makefile

Modified: csw/mgar/pkg/libtool/branches/libtool24/Makefile
===================================================================
--- csw/mgar/pkg/libtool/branches/libtool24/Makefile	2011-03-08 21:19:14 UTC (rev 13694)
+++ csw/mgar/pkg/libtool/branches/libtool24/Makefile	2011-03-08 21:27:29 UTC (rev 13695)
@@ -34,21 +34,28 @@
 COMPILER_TAGNAME_GCC4 = gcc4
 COMPILER_TAGNAME_SOS12 = sos12
 
-PACKAGES = CSWlibtool CSWlibltdl7 CSWlibtoolrt
+VENDOR_URL = http://www.gnu.org/software/libtool/
 
+PACKAGES += CSWlibtool
 CATALOGNAME_CSWlibtool = libtool
-CATALOGNAME_CSWlibltdl7 = libltdl7
-CATALOGNAME_CSWlibtoolrt = libtool_rt
+SPKG_DESC_CSWlibtool = A generic library support tool
+# Double-legacy packages may not even depend on CSWlibtoolrt, so we must
+# also directly depend on CSWlibltdl3
+RUNTIME_DEP_PKGS_CSWlibtool += CSWlibltdl3
+RUNTIME_DEP_PKGS_CSWlibtool += CSWlibltdl7
+CHECKPKG_OVERRIDES_CSWlibtool += surplus-dependency|CSWlibltdl3
+CHECKPKG_OVERRIDES_CSWlibtool += surplus-dependency|CSWlibltdl7
 
-SPKG_SOURCEURL = http://www.gnu.org/software/libtool/
+# This is built from pkgs/libltdl3
+FOREIGN_PACKAGES += CSWlibltdl3
+OBSOLETES_CSWlibltdl3 += CSWlibtoolrt
 
-RUNTIME_DEP_PKGS_CSWlibtool = CSWlibltdl7
-RUNTIME_DEP_PKGS_CSWlibtoolrt = CSWlibltdl3 CSWlibltdl7
+PACKAGES += CSWlibltdl7
+CATALOGNAME_CSWlibltdl7 = libltdl7
+SPKG_DESC_CSWlibltdl7 = Libtool libltdl.so.7 from libtool 2.x
+PKGFILES_CSWlibltdl7 += $(PKGFILES_RT)
+OBSOLETES_CSWlibltdl7 += CSWlibtoolrt
 
-SPKG_DESC_CSWlibtool   = A generic library support tool
-SPKG_DESC_CSWlibltdl7  = Libtool libltdl.so.7 from libtool 2.x
-SPKG_DESC_CSWlibtoolrt = Runtime libraries for libtool
-
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
@@ -69,15 +76,6 @@
     MERGE_SCRIPTS_isa-default-garcompiler-GCC3 = copy-tags
     MERGE_SCRIPTS_isa-default-garcompiler-GCC4 = copy-tags
 
-PKGFILES_CSWlibltdl7 = $(PKGFILES_RT)
-PKGFILES_CSWlibtoolrt = NONE
-
-ARCHALL_CSWlibtoolrt = 1
-
-CHECKPKG_OVERRIDES_CSWlibtool += surplus-dependency|CSWlibltdl7
-CHECKPKG_OVERRIDES_CSWlibtoolrt += surplus-dependency|CSWlibltdl3
-CHECKPKG_OVERRIDES_CSWlibtoolrt += surplus-dependency|CSWlibltdl7
-
 include gar/category.mk
 
 post-install-modulated: $(if $(PATCHFILES_POSTINSTALL_$(MODULATION)),patch-libtool)


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