[csw-devel] gar issue with modulation specific patches

[Dagobert Michelsen]

Hi Ben,

Am 24.04.2011 um 02:28 schrieb Ben Walton:
> I hit a funny problem tonight when trying to add a modulation specific
> patch to php5 (I need to call pg_config32 on sparc, but pg_config on
> i386).  At fetch time, the patch wasn't getting pulled down.  The
> fetch-list target displayed the patch properly though, under the
> expected modulations.
> 
> Tracing the issue, I found:
> 
> 1. ALLFILES_PATCHFILES is defined in gar.mk line 34.  It is set with
>   ?= and uses the value of MODULATIONS
> 2. gar.mk includes gar.lib.mk at line 76.
> 3. MODULATIONS is defined in gar.mk line 93.
> 4. URLS is set in gar.lib.mk line 34.  It is set with := (simple
>   expansion)
> 
> So, when URLS is set, MODULATIONS as used by ALLFILES_PATCHFILES has
> no value.  This prevents modulation specific patches from being
> fetchable.
> 
> The following patch seems to resolve the problem for me.  Does anyone
> see possible side effects to this that might be undesirable?

I see no problem with that, please proceed.


Best regards

  -- Dago


> 
> --snip--
> Index: gar.mk
> ===================================================================
> --- gar.mk      (revision 14383)
> +++ gar.mk      (working copy)
> @@ -73,7 +73,6 @@
> 
> # include the configuration file to override any of these variables
> include $(GARDIR)/gar.conf.mk
> -include $(GARDIR)/gar.lib.mk
> 
> # ========================= MODULATIONS ======================== 
> 
> @@ -92,6 +91,8 @@
> 
> MODULATIONS ?= $(filter-out $(SKIP_MODULATIONS),$(strip $(call
> modulations,$(strip $(MODULATORS)))))
> 
> +include $(GARDIR)/gar.lib.mk
> +
> # _modulate(ISA STATIC,,,)
> # -> _modulate2(STATIC,isa-i386,ISA,ISA=i386)
> #    -> _modulate2(,,isa-i386-static-yes,ISA STATIC,ISA=i386
> STATIC=yes)
> 
> --snip--
> 
> Thanks
> -Ben
> --
> Ben Walton
> Systems Programmer - CHASS
> University of Toronto
> C:416.407.5610 | W:416.978.4302
> 
> _______________________________________________
> devel mailing list
> devel at lists.opencsw.org
> https://lists.opencsw.org/mailman/listinfo/devel