Whamcloud - gitweb
LU-15797 build: Workaround _fix_broken_configure_for_lto
authorShaun Tancheff <shaun.tancheff@hpe.com>
Fri, 24 Jun 2022 19:31:56 +0000 (12:31 -0700)
committerAndreas Dilger <adilger@whamcloud.com>
Mon, 27 Jun 2022 02:13:33 +0000 (02:13 +0000)
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

Lustre-change: https://review.whamcloud.com/47168
Lustre-commit: 9b16459fbcbd6587f1a8669490352cc389a7a410

HPE-bug-id: LUS-10918
Signed-off-by: Shaun Tancheff <shaun.tancheff@hpe.com>
Change-Id: I53072c0ffdf82abc938322e9c408cc44f5033ab9
Reviewed-by: Jian Yu <yujian@whamcloud.com>
Reviewed-by: Nathaniel Clark <nclark@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/47774
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
lustre.spec.in

index 4feac18..82e1642 100644 (file)
@@ -652,7 +652,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
 
 %{?_openmpi_load}
 %{?_mpich_load}