[csw-devel] SF.net SVN: gar:[11547] csw/mgar/gar/v2

[dmichelsen at users.sourceforge.net]

Revision: 11547
          http://gar.svn.sourceforge.net/gar/?rev=11547&view=rev
Author:   dmichelsen
Date:     2010-11-10 15:04:13 +0000 (Wed, 10 Nov 2010)

Log Message:
-----------
Add new variable RUNTIME_DEP_PKGS_ONLY_* to finer control dependencies

Modified Paths:
--------------
    csw/mgar/gar/v2/categories/cpan/category.mk
    csw/mgar/gar/v2/gar.pkg.mk
    csw/mgar/gar/v2/pkglib/csw_cpan_dyngspec.gspec

Modified: csw/mgar/gar/v2/categories/cpan/category.mk
===================================================================
--- csw/mgar/gar/v2/categories/cpan/category.mk	2010-11-10 14:46:12 UTC (rev 11546)
+++ csw/mgar/gar/v2/categories/cpan/category.mk	2010-11-10 15:04:13 UTC (rev 11547)
@@ -39,6 +39,8 @@
 _MERGE_EXCLUDE_CATEGORY = .*/perllocal\.pod .*/\.packlist
 _CATEGORY_GSPEC_INCLUDE ?= csw_cpan_dyngspec.gspec
 
+_CATEGORY_RUNTIME_DEP_PKGS ?= CSWperl
+
 # Perl module dependencies can not be properly tracked right now
 _CATEGORY_CHECKPKG_OVERRIDES = surplus-dependency
 

Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk	2010-11-10 14:46:12 UTC (rev 11546)
+++ csw/mgar/gar/v2/gar.pkg.mk	2010-11-10 15:04:13 UTC (rev 11547)
@@ -456,16 +456,19 @@
 # The dependencies to CSWcswclassutils and CSWtexinfo are only added if there are files
 # actually matching the _TEXINFO_FILTER. This is done at the prototype-level.
 $(WORKDIR)/%.depend: $(WORKDIR)/$*.prototype
+$(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(_CATEGORY_RUNTIME_DEP_PKGS)
 $(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane 'print "yes" if( $$F[1] eq "cswalternatives")')),CSWalternatives)
 $(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach C,$(_CSWCLASSES),print "$C\n" if( $$F[1] eq "$C");)')),CSWcswclassutils)
 
+$(WORKDIR)/%.depend: _DEP_PKGS=$(or $(RUNTIME_DEP_PKGS_ONLY_$*),$(RUNTIME_DEP_PKGS_ONLY),$(sort $(_EXTRA_GAR_PKGS)) $(or $(RUNTIME_DEP_PKGS_$*),$(RUNTIME_DEP_PKGS),$(DEP_PKGS_$*),$(DEP_PKGS)))
+$(WORKDIR)/%.depend: $(WORKDIR)
 # The final "true" is for packages without dependencies to make the shell happy as "( )" is not allowed.
-$(WORKDIR)/%.depend: $(WORKDIR)
-	$(_DBG)$(if $(_EXTRA_GAR_PKGS)$(RUNTIME_DEP_PKGS_$*)$(RUNTIME_DEP_PKGS)$(DEP_PKGS)$(DEP_PKGS_$*)$(INCOMPATIBLE_PKGS)$(INCOMPATIBLE_PKGS_$*), \
+$(WORKDIR)/%.depend:
+	$(_DBG)$(if $(_DEP_PKGS)$(INCOMPATIBLE_PKGS)$(INCOMPATIBLE_PKGS_$*), \
 		($(foreach PKG,$(INCOMPATIBLE_PKGS_$*) $(INCOMPATIBLE_PKGS),\
 			echo "I $(PKG)";\
 		)\
-		$(foreach PKG,$(sort $(_EXTRA_GAR_PKGS)) $(or $(RUNTIME_DEP_PKGS_$*),$(RUNTIME_DEP_PKGS),$(DEP_PKGS_$*),$(DEP_PKGS)),\
+		$(foreach PKG,$(_DEP_PKGS),\
 			$(if $(SPKG_DESC_$(PKG)), \
 				echo "P $(PKG) $(call catalogname,$(PKG)) - $(SPKG_DESC_$(PKG))";, \
 				echo "$(shell (/usr/bin/pkginfo $(PKG) || echo "P $(PKG) - ") | $(GAWK) '{ $$1 = "P"; print } ')"; \

Modified: csw/mgar/gar/v2/pkglib/csw_cpan_dyngspec.gspec
===================================================================
--- csw/mgar/gar/v2/pkglib/csw_cpan_dyngspec.gspec	2010-11-10 14:46:12 UTC (rev 11546)
+++ csw/mgar/gar/v2/pkglib/csw_cpan_dyngspec.gspec	2010-11-10 15:04:13 UTC (rev 11547)
@@ -1,5 +1,4 @@
 %include        url file://%{PKGLIB}/csw_vars.gspec
 %pkginfo        url file://%{PKGLIB}/csw/pkginfo
 %prototype      exec cswproto -s %{TIMESTAMP} -r %{DESTDIR} %{DESTDIR}
-%depend:merge   url file://%{PKGLIB}/csw/depend.perl
 %depend         exec gawk '$1 ~ /f/{print $3}' %{prototype} | depmaker --root %{DESTDIR} --nodep %{pkgname} %{DEPMAKER_EXTRA_ARGS}


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