8294317: Insufficient build rules for tzdb.dat

naotoj · naotoj · commit 71511283ce02 · 2022-09-27T16:01:47.000Z
Reviewed-by: joehw, erikj
diff --git a/make/modules/java.base/gendata/GendataTZDB.gmk b/make/modules/java.base/gendata/GendataTZDB.gmk
@@ -30,7 +30,7 @@ GENDATA_TZDB :=
 #
 TZDATA_DIR := $(MODULE_SRC)/share/data/tzdata
 TZDATA_TZFILE := africa antarctica asia australasia europe northamerica southamerica backward etcetera gmt jdk11_backward
-TZDATA_TZFILES := $(addprefix $(TZDATA_DIR)/,$(TZDATA_TZFILE))
+TZDATA_TZFILES := $(wildcard $(TZDATA_DIR)/*)
 
 GENDATA_TZDB_DAT := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE)/tzdb.dat
 

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ GENDATA_TZDB :=`
`30`	`30`	`#`
`31`	`31`	`TZDATA_DIR := $(MODULE_SRC)/share/data/tzdata`
`32`	`32`	`TZDATA_TZFILE := africa antarctica asia australasia europe northamerica southamerica backward etcetera gmt jdk11_backward`
`33`		`-TZDATA_TZFILES := $(addprefix $(TZDATA_DIR)/,$(TZDATA_TZFILE))`
	`33`	`+TZDATA_TZFILES := $(wildcard $(TZDATA_DIR)/*)`
`34`	`34`
`35`	`35`	`GENDATA_TZDB_DAT := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE)/tzdb.dat`
`36`	`36`