RFR: 8294317: Insufficient build rules for tzdb.dat [v2]

[Erik Joelsson]

On Mon, 26 Sep 2022 16:32:43 GMT, Naoto Sato <naoto at openjdk.org> wrote:

>> make/modules/java.base/gendata/GendataTZDB.gmk line 33:
>> 
>>> 31: TZDATA_DIR := $(MODULE_SRC)/share/data/tzdata
>>> 32: TZDATA_TZFILE := africa antarctica asia australasia europe northamerica southamerica backward etcetera gmt jdk11_backward
>>> 33: TZDATA_TZFILES := $(TZDATA_DIR)/*
>> 
>> Have you verified that this works? I would expect a wildcard call to be needed. 
>> Suggestion:
>> 
>> TZDATA_TZFILES := $(wildcard $(TZDATA_DIR)/*)
>
> I confirmed the fix worked, on my local mac and mach5. However, your suggestion does seem the right way. Modified the fix as suggested.

Hm, yes, I think there are some cases where wildcards will be resolved without a call to wildcard. I'm also not sure that kind of expansion works the same across make versions, and if you ever needed to use that file list for anything else, it would be easy to trip up. I think this was expanded in the rule evaluation itself, not in the assignment. By being explicit with the call, we know what we are getting.

-------------

PR: https://git.openjdk.org/jdk/pull/10415