diff options
author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2023-02-22 17:59:16 -0800 |
---|---|---|
committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2023-02-22 17:59:16 -0800 |
commit | a5761ea1c319455e810882ff3a6d0ecaf7485806 (patch) | |
tree | e78f5be4251c87b2aecb6db1acc49e01df7d1709 | |
parent | 9d01c54be9bd58e5c5a4e5f11eaafa8d47bfbd98 (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 72b919f..a0bc64f 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 ded969f..fd6c4f4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -56,7 +56,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 93d3daa..1b6775b 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([100dpi]) XORG_FONT_BDF_UTILS |