[csw-maintainers] Problem with GAR variable name change GARNAME, GARVERSION -> NAME, VERSION

[Dagobert Michelsen]

Hi Sebastian,

Am 12.12.2010 um 13:50 schrieb Sebastian Kayser:
> in preparation for further enhancements to GAR, I just committed an
> important variable name change to our repo with r11888.
> 
>    GARNAME     -->   NAME
>    GARVERSION  -->   VERSION

This has an ugly side effect: The variable names are used inside the
modulations and a modulation has the name
  <modulationvariable1>-<value1>-<modulationvariable2>-<value2>...
These modulation names are used e.g. in the merge phase and the
custom merge rules when doing modulations on more than the standard
variables won't work any more as the reference "garversion"
instead of "version". For the Makefile of OpenLDAP where I
discovered the effect the following definitions are affected:

PATCHFILES_isa-sparcv8-garversion-2.4.23 = patch-oldap-2.4.16-ntlm.diff
PATCHFILES_isa-sparcv9-garversion-2.4.23 = patch-oldap-2.4.16-ntlm.diff
PATCHFILES_isa-i386-garversion-2.4.23 = patch-oldap-2.4.16-ntlm.diff
PATCHFILES_isa-amd64-garversion-2.4.23 = patch-oldap-2.4.16-ntlm.diff
EXTRA_LIB_garversion-2.3.43 = $(prefix)/bdb44/lib 
EXTRA_INC_garversion-2.3.43 = $(prefix)/bdb44/include
EXTRA_LIB_garversion-2.4.23 = $(bdbdir)/lib 
EXTRA_INC_garversion-2.4.23 = $(bdbdir)/include
EXTRA_LIB = $(EXTRA_LIB_garversion-$(VERSION))
EXTRA_INC = $(EXTRA_INC_garversion-$(VERSION))
MERGE_SCRIPTS_isa-default-garversion-2.3.43 = copy-only
MERGE_DIRS_isa-default-garversion-2.3.43 = $(libdir)
MERGE_SCRIPTS_isa-default64-garversion-2.3.43 = copy-relocated-only
MERGE_DIRS_isa-default64-garversion-2.3.43 = $(libdir)
MERGE_SCRIPTS_isa-default-garversion-2.4.23 = copy-all
MERGE_SCRIPTS_isa-default64-garversion-2.4.23 = copy-relocated-only
MERGE_DIRS_isa-default64-garversion-2.4.23 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
EXTRA_MERGE_EXCLUDE_FILES_isa-i386-garversion-2.3.43 = .*\.so
EXTRA_MERGE_EXCLUDE_FILES_isa-amd64-garversion-2.3.43 = .*\.so
EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-garversion-2.3.43 = .*\.so
EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9-garversion-2.3.43 = .*\.so

I suppose most of the complex Makefiles are mine and I am capable of
handling it myself, but just a note: If you encounter anything strange
in a Makefile it may be of this very reason.


Best regards

  -- Dago