[PATCH util/macros] Add XORG_DEFAULT_NOCODE_OPTIONS and bump version to 1.20.0

0 views
Skip to first unread message

Alan Coopersmith

unread,
Feb 5, 2023, 7:00:14 PM2/5/23
to xorg-...@lists.x.org
Allows data, doc, & font modules that don't compile any code
to avoid spending time running a bunch of compiler tests whose
results they'll ignore and never use.

Signed-off-by: Alan Coopersmith <alan.coo...@oracle.com>
---

I've submitted https://gitlab.freedesktop.org/xorg/util/macros/-/merge_requests/3
for this, but am mailing it out for higher visibility as it seems few people
look at merge requests for the outlying repos.

Tested by replacing XORG_DEFAULT_OPTIONS with XORG_GEFAULT_NOCODE_OPTIONS in
data/*, doc/*, and font/* (except font/utils which does compile programs) and
then running build.sh and verifying all the projects built with GNU autotools
still built correctly and the updated projects no longer ran all the compiler
checks.

This could also be applied to util/cf, but as that has a release out with
meson.build included for testing already, the next step there is to remove
configure.ac not improve it.

configure.ac | 2 +-
xorg-macros.m4.in | 26 +++++++++++++++++++-------
2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 49be7dc..1008187 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure.

AC_PREREQ([2.62])
AC_INIT([util-macros],
- [1.19.3],
+ [1.20.0],
[https://gitlab.freedesktop.org/xorg/util/macros/issues],
[util-macros])
AC_CONFIG_SRCDIR([Makefile.am])
diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in
index 8d57724..235c871 100644
--- a/xorg-macros.m4.in
+++ b/xorg-macros.m4.in
@@ -1815,23 +1815,35 @@ AC_SUBST([BASE_]PREFIX[FLAGS])
AC_LANG_CASE([C], AC_SUBST([CWARNFLAGS]))
]) # XORG_STRICT_OPTION

+# XORG_DEFAULT_NOCODE_OPTIONS
+# ---------------------------
+# Minimum version: 1.20.0
+#
+# Defines default options for X.Org modules which don't compile code,
+# such as fonts, bitmaps, cursors, and docs.
+#
+AC_DEFUN([XORG_DEFAULT_NOCODE_OPTIONS], [
+AC_REQUIRE([AC_PROG_INSTALL])
+XORG_RELEASE_VERSION
+XORG_CHANGELOG
+XORG_INSTALL
+XORG_MANPAGE_SECTIONS
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])],
+ [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])])
+]) # XORG_DEFAULT_NOCODE_OPTIONS
+
# XORG_DEFAULT_OPTIONS
# --------------------
# Minimum version: 1.3.0
#
-# Defines default options for X.Org modules.
+# Defines default options for X.Org modules which compile code.
#
AC_DEFUN([XORG_DEFAULT_OPTIONS], [
AC_REQUIRE([AC_PROG_INSTALL])
XORG_COMPILER_FLAGS
XORG_CWARNFLAGS
XORG_STRICT_OPTION
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
-XORG_INSTALL
-XORG_MANPAGE_SECTIONS
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])],
- [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])])
+XORG_DEFAULT_NOCODE_OPTIONS
]) # XORG_DEFAULT_OPTIONS

# XORG_INSTALL()
--
2.15.2

Alan Coopersmith

unread,
Feb 5, 2023, 10:00:30 PM2/5/23
to xorg-...@lists.x.org
On 2/5/23 15:59, Alan Coopersmith wrote:
> This could also be applied to util/cf, but as that has a release out with
> meson.build included for testing already, the next step there is to remove
> configure.ac not improve it.

Oops, I misremembered, the meson support is merged but not yet released,
so I'd add this change to its release for the sake of people building
with autoconf in the final release before it's removed in favor of meson.

--
-Alan Coopersmith- alan.coo...@oracle.com
Oracle Solaris Engineering - https://blogs.oracle.com/solaris

Reply all
Reply to author
Forward
0 new messages