Rebased ref, commits from common ancestor:
commit bb6e864f2e7f31683486e8f5b82ead49a7f63365
Author: Andras Timar <[email protected]>
AuthorDate: Fri Mar 6 23:03:06 2026 +0100
Commit: Andras Timar <[email protected]>
CommitDate: Fri Mar 6 23:21:43 2026 +0100
don't fetch culmus tarball when --enable-mpl-subset is used
Culmus fonts are GPL v2, so they are correctly excluded from the build
by Module_more_fonts.mk when MPL_SUBSET is set, but the tarball was
still being downloaded unconditionally via Makefile.fetch.
Change-Id: Ib7538a6931a96539a5dcded6fb786c5d5f264dd4
diff --git a/Makefile.fetch b/Makefile.fetch
index 162fc3043d8c..68a46ce01b0f 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -197,7 +197,7 @@ fetch_SRC_TARBALLS := \
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_LAO_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_SERIF_LAO_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_LISU_TARBALL) \
- $(call fetch_Optional,MORE_FONTS,FONT_CULMUS_TARBALL) \
+ $(if $(MPL_SUBSET),,$(call
fetch_Optional,MORE_FONTS,FONT_CULMUS_TARBALL)) \
$(call fetch_Optional,MORE_FONTS,FONT_LIBRE_HEBREW_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_ALEF_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_AMIRI_TARBALL) \
