diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2023-02-22 17:59:17 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2023-02-22 17:59:17 -0800 |
| commit | d52f6972a0743fbd9434f6d78e802f699268facf (patch) | |
| tree | eb42f6973929d5a65a8ee120ff9802f17f8cda68 | |
| parent | 6fdb9ea0750b2ff68c185dff1abd03e04dd26e0f (diff) | |
Use COMPRESS_FLAGS to improve build reproducibility
Raises required version of font-util from 1.2 to 1.4
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 296aaf7..cfeda91 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,7 +29,7 @@ variables: # The tag should be updated each time the list of packages is updated. # Changing a tag forces the associated image to be rebuilt. # Note: the tag has no meaning, we use a date format purely for readability - FDO_DISTRIBUTION_TAG: '2023-02-15.0' + FDO_DISTRIBUTION_TAG: '2023-02-22.0' FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake make xorg-util-macros xorg-font-util xorg-fonts-encodings xorg-bdftopcf xorg-mkfontscale fontconfig' diff --git a/Makefile.am b/Makefile.am index c700005..afe383b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,7 +30,7 @@ SUFFIXES = .bdf .pcf$(COMPRESS_SUFFIX) .bdf.pcf$(COMPRESS_SUFFIX): @rm -f $@ - $(AM_V_GEN)$(BDFTOPCF) -t $< | $(COMPRESS) > $@ + $(AM_V_GEN)$(BDFTOPCF) -t $< | $(COMPRESS) $(COMPRESS_FLAGS) > $@ fontdir = @FONTDIR@ font_DATA = $(PCF_FILES) diff --git a/configure.ac b/configure.ac index 8de5ad9..87065d5 100644 --- a/configure.ac +++ b/configure.ac @@ -33,10 +33,10 @@ m4_ifndef([XORG_MACROS_VERSION], XORG_MACROS_VERSION(1.20) XORG_DEFAULT_NOCODE_OPTIONS -# Require X.Org's font util macros 1.2 or later +# Require X.Org's font util macros 1.4 or later for COMPRESS_FLAGS m4_ifndef([XORG_FONT_MACROS_VERSION], - [m4_fatal([must install X.Org font-util 1.2 or later before running autoconf/autogen])]) -XORG_FONT_MACROS_VERSION(1.2) + [m4_fatal([must install X.Org font-util 1.4 or later before running autoconf/autogen])]) +XORG_FONT_MACROS_VERSION(1.4) XORG_FONTDIR([misc]) XORG_FONT_BDF_UTILS |