Merge branch 'adb-7.1.0' into ADBDEV-5423

arenadata · Jul 1, 2024 · c6b8486 · c6b8486
2 parents bc2c8ab + 46dc8aa
commit c6b8486
Show file tree

Hide file tree

Showing 5 changed files with 2,269 additions and 2,413 deletions.
diff --git a/src/timezone/Makefile b/src/timezone/Makefile
@@ -59,9 +59,10 @@ ifeq (,$(with_system_tzdata))
 endif
 	$(MAKE) -C tznames $@
 
+# Note: -P code currently depends on '-b fat'. Not worth fixing right now.
 abbrevs.txt: zic $(TZDATAFILES)
 	mkdir junkdir
-	$(ZIC) -P -d junkdir -p '$(POSIXRULES)' $(TZDATAFILES) | LANG=C sort | uniq >abbrevs.txt
+	$(ZIC) -P -b fat -d junkdir -p '$(POSIXRULES)' $(TZDATAFILES) | LANG=C sort | uniq >abbrevs.txt
 	rm -rf junkdir
 
 installdirs: