314a048f68
Bundling mozjs in gjs should make it possible to remove the system wide mozjs115 package from base RHEL 10, which makes it easier in the future if we need to update gjs to use newer mozjs. At that point, we can just update gjs to the new mozjs version it needs and not have to worry about maintaining a system-wide mozjs115 for all of RHEL 10 lifetime. Adapted from the corresponding RHEL 9 change by Kalev Lember. Resolves: Resolves: RHEL-30208
30 lines
985 B
Diff
30 lines
985 B
Diff
From 2d99a7b076578a3394fb9d5be6eb44f9cfebc681 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
|
|
Date: Mon, 9 Aug 2021 16:15:37 +0200
|
|
Subject: [PATCH] Remove sloppy m4 detection from bundled autoconf
|
|
|
|
---
|
|
build/autoconf/autoconf.sh | 6 ------
|
|
1 file changed, 6 deletions(-)
|
|
|
|
diff --git a/build/autoconf/autoconf.sh b/build/autoconf/autoconf.sh
|
|
index ceb8a25..606c74e 100644
|
|
--- a/build/autoconf/autoconf.sh
|
|
+++ b/build/autoconf/autoconf.sh
|
|
@@ -114,12 +114,6 @@ fi
|
|
|
|
# Use the frozen version of Autoconf if available.
|
|
r= f=
|
|
-# Some non-GNU m4's don't reject the --help option, so give them /dev/null.
|
|
-case `$M4 --help < /dev/null 2>&1` in
|
|
-*reload-state*) test -r $AC_MACRODIR/autoconf.m4f && { r=--reload f=f; } ;;
|
|
-*traditional*) ;;
|
|
-*) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin; exit 1 ;;
|
|
-esac
|
|
|
|
$M4 -I$AC_MACRODIR $use_localdir $r autoconf.m4$f $infile > $tmpout ||
|
|
{ rm -f $tmpin $tmpout; exit 2; }
|
|
--
|
|
2.31.1
|
|
|