From 9b16459fbcbd6587f1a8669490352cc389a7a410 Mon Sep 17 00:00:00 2001 From: Shaun Tancheff Date: Sun, 1 May 2022 17:18:28 +0700 Subject: [PATCH] LU-15797 build: Workaround _fix_broken_configure_for_lto Workaround _fix_broken_configure_for_lto macro added to configure macro in RHEL9: redhat-rpm-config.noarch 190-1.el9.alma @appstream Use configure macro directly if it is not parseable HPE-bug-id: LUS-10918 Signed-off-by: Shaun Tancheff Change-Id: I53072c0ffdf82abc938322e9c408cc44f5033ab9 Reviewed-on: https://review.whamcloud.com/47168 Tested-by: jenkins Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: Jian Yu Reviewed-by: Nathaniel Clark Reviewed-by: Oleg Drokin --- lustre.spec.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lustre.spec.in b/lustre.spec.in index 1cb88fa..dfbd282 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -479,7 +479,13 @@ fi # also remove (build|host|target) options because they will be specified # inside $CONFIGURE_ARGS # kmod tools/scripts require "name" directory with kernel modules -%define eval_configure %(echo '%configure' | sed -e 's#\./configure#eval ./configure#' -e 's/--\\(build\\|host\\|target\\)=[^ ][^ ]* //g') + +%if 0%{?rhel} >= 9 +%define _configure eval ./configure +%define eval_configure %configure +%else +%define eval_configure %(echo -n '%configure' | sed -e 's#\./configure#eval ./configure#' -e 's/--\\(build\\|host\\|target\\)=[^ ][^ ]* //g') +%endif %if %{with mpi} %if %{mpi_name} == "mpich" -- 1.8.3.1