mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2025-12-21 21:17:37 -08:00
47 lines
1.8 KiB
Diff
47 lines
1.8 KiB
Diff
https://bugs.gentoo.org/965315
|
||
|
||
From 5196d40b6ec6ad75e84ab98e9f4a3d71211f0d56 Mon Sep 17 00:00:00 2001
|
||
From: Lars Wendler <polynomial-c@gmx.de>
|
||
Date: Thu, 30 Oct 2025 07:31:59 +0100
|
||
Subject: [PATCH] configure.ac: avoid bashisms
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
or else configure check doesn't succeed with non-bash shell (e.g. dash):
|
||
|
||
checking whether to enable AMD64 as(1) feature detection... /var/tmp/portage/sys-boot/grub-2.14_rc1/work/grub-2.14~rc1/configure: 39176: test: xx86_64: unexpected operator
|
||
no
|
||
|
||
and later build fails with
|
||
|
||
/var/tmp/portage/sys-boot/grub-2.14_rc1/work/grub-2.14~rc1/grub-core/lib/libgcrypt-grub/src/hwf-x86.c: In function ‘detect_x86_gnuc’:
|
||
/var/tmp/portage/sys-boot/grub-2.14_rc1/work/grub-2.14~rc1/grub-core/lib/libgcrypt-grub/src/hwf-x86.c:252:17: error: ‘HWF_INTEL_CPU’ undeclared (first use in this function)
|
||
252 | result |= HWF_INTEL_CPU;
|
||
| ^~~~~~~~~~~~~
|
||
|
||
and other corresponding HWF_INTEL_* definitions because HAVE_CPU_ARCH_X86 was
|
||
erroneously not defined by configure script.
|
||
|
||
Signed-off-by: Lars Wendler <polynomial-c@gmx.de>
|
||
---
|
||
configure.ac | 2 +-
|
||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
||
diff --git a/configure.ac b/configure.ac
|
||
index 8a72c078e..17937baf4 100644
|
||
--- a/configure.ac
|
||
+++ b/configure.ac
|
||
@@ -1150,7 +1150,7 @@ fi
|
||
|
||
# Implementation of the --disable-amd64-as-feature-detection switch.
|
||
AC_MSG_CHECKING([whether to enable AMD64 as(1) feature detection])
|
||
-if test x$target_cpu == xx86_64 -a x$platform == xefi; then
|
||
+if test x$target_cpu = xx86_64 -a x$platform = xefi; then
|
||
CPPFLAGS_GCRY_ASM="-D__x86_64 -DHAVE_CPU_ARCH_X86"
|
||
AC_ARG_ENABLE(amd64-as-feature-detection,
|
||
AS_HELP_STRING([--disable-amd64-as-feature-detection],
|
||
--
|
||
2.51.1
|
||
|