diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2023-02-06 13:13:21 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2023-02-08 12:31:25 -0800 |
| commit | 9c66a587f301a4e35b9de68bc6d7419247f0e062 (patch) | |
| tree | 227f595dd9677f4404ce44be3112e5a52eab3c57 | |
| parent | 5a8a115aa49d06e29a32d1fc5466308b00e9095a (diff) | |
configure: raise minimum autoconf requirement to 2.70
Needed for builds on NetBSD to work correctly, since it depends on
AC_USE_SYSTEM_EXTENSIONS defining _OPENBSD_SOURCE to expose the
prototype for reallocarray() in the system headers.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | .gitlab-ci.yml | 9 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6b21b29..89c00a9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ # Please see the ci-templates documentation for details: # https://freedesktop.pages.freedesktop.org/ci-templates/ -.templates_sha: &template_sha 34f4ade99434043f88e164933f570301fd18b125 # see https://docs.gitlab.com/ee/ci/yaml/#includefile +.templates_sha: &template_sha 976b2e1ed25998fe36f90fc8bb72fe2acbab405b # see https://docs.gitlab.com/ee/ci/yaml/#includefile include: @@ -27,12 +27,13 @@ stages: variables: FDO_UPSTREAM_REPO: 'xorg/app/fslsfonts' - FDO_DISTRIBUTION_VERSION: 'stable' + # 'testing' needed to get autoconf >= 2.70 in Debian as of 2023-03-08 + FDO_DISTRIBUTION_VERSION: 'testing' # 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: '2021-12-03.0' - FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake make xutils-dev libfs-dev' + FDO_DISTRIBUTION_TAG: '2023-03-08.1' + FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake make xutils-dev libfs-dev xz-utils' # diff --git a/configure.ac b/configure.ac index 5377041..7f1c3c5 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ dnl dnl Process this file with autoconf to create configure. # Initialize Autoconf -AC_PREREQ([2.60]) +AC_PREREQ([2.70]) AC_INIT([fslsfonts], [1.0.6], [https://gitlab.freedesktop.org/xorg/app/fslsfonts/-/issues], [fslsfonts]) |