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

[dmichelsen at users.sourceforge.net]

Revision: 9577
          http://gar.svn.sourceforge.net/gar/?rev=9577&view=rev
Author:   dmichelsen
Date:     2010-04-09 12:30:28 +0000 (Fri, 09 Apr 2010)

Log Message:
-----------
mGAR v2: Do not check package dependencies for Perl modules as it does not work right now

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

Modified: csw/mgar/gar/v2/categories/cpan/category.mk
===================================================================
--- csw/mgar/gar/v2/categories/cpan/category.mk	2010-04-09 11:33:03 UTC (rev 9576)
+++ csw/mgar/gar/v2/categories/cpan/category.mk	2010-04-09 12:30:28 UTC (rev 9577)
@@ -39,6 +39,9 @@
 _MERGE_EXCLUDE_CATEGORY = .*/perllocal\.pod .*/\.packlist
 _CATEGORY_GSPEC_INCLUDE ?= csw_cpan_dyngspec.gspec
 
+# Perl module dependencies can not be properly tracked right now
+_CATEGORY_CHECKPKG_OVERRIDES = surplus-dependency
+
 include gar/gar.mk
 
 CONFIGURE_ENV += PERL5LIB=$(PERL5LIB)

Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk	2010-04-09 11:33:03 UTC (rev 9576)
+++ csw/mgar/gar/v2/gar.pkg.mk	2010-04-09 12:30:28 UTC (rev 9577)
@@ -680,12 +680,12 @@
 merge-checkpkgoverrides-%:
 	@echo "[ Generating checkpkg override for package $* ]"
 	$(_DBG)ginstall -d $(PKGROOT)/opt/csw/share/checkpkg/overrides
-	$(_DBG)($(foreach O,$(or $(CHECKPKG_OVERRIDES_$*),$(CHECKPKG_OVERRIDES)),echo "$O";)) | \
+	$(_DBG)($(foreach O,$(or $(CHECKPKG_OVERRIDES_$*),$(CHECKPKG_OVERRIDES)) $(_CATEGORY_CHECKPKG_OVERRIDES),echo "$O";)) | \
 		perl -F'\|' -ane 'unshift @F,"$*"; $$F[0].=":"; print join(" ", at F );' \
 		> $(PKGROOT)/opt/csw/share/checkpkg/overrides/$(call catalogname,$*)
 	@$(MAKECOOKIE)
 
-merge-checkpkgoverrides: $(foreach S,$(SPKG_SPECS),$(if $(or $(CHECKPKG_OVERRIDES_$S),$(CHECKPKG_OVERRIDES)),merge-checkpkgoverrides-$S))
+merge-checkpkgoverrides: $(foreach S,$(SPKG_SPECS),$(if $(or $(CHECKPKG_OVERRIDES_$S),$(CHECKPKG_OVERRIDES),$(_CATEGORY_CHECKPKG_OVERRIDES)),merge-checkpkgoverrides-$S))
 
 reset-merge-checkpkgoverrides:
 	@rm -f $(COOKIEDIR)/merge-checkpkgoverrides $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-checkpkgoverrides-$(SPEC))


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