Bug #36044149 Extend support for RPM builds with PGO to EL8+

bjornmu · bjornmu · commit efdf012a727e · 2023-11-24T17:22:58.000+01:00
Change the rhel conditoion from == 7 to &gt;= 7

For 8.3+ this condition can be removed since 6 is not supported.

Add DISABLE_MISSING_PROFILE_WARNING() to libfido2 as it otherwise fails
to compile in the second phase. This was not needed before since
libfido2 does not build on EL7.

Change-Id: Id2bcf30bdcc073e3257a83aa4edc5367c7f27f2f
diff --git a/extra/libfido2/libfido2-1.13.0/CMakeLists.txt b/extra/libfido2/libfido2-1.13.0/CMakeLists.txt
@@ -25,6 +25,8 @@ if(CHECK_PIE_SUPPORTED)
 	check_pie_supported(LANGUAGES C)
 endif()
 
+DISABLE_MISSING_PROFILE_WARNING()
+
 # set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 # set(CMAKE_COLOR_MAKEFILE OFF)
 # set(CMAKE_VERBOSE_MAKEFILE ON)
diff --git a/packaging/rpm-oel/mysql.spec.in b/packaging/rpm-oel/mysql.spec.in
@@ -41,10 +41,10 @@
 %global with_router 1
 %endif
 
-# PGO option, currently only for el7
-%if 0%{?rhel} == 7
+# PGO option, not for OEL6
+%if 0%{?rhel} >= 7
 %{?with_pgo:   %global pgo 1}
-%endif # rhel7
+%endif # rhel >= 7
 
 # Pass path to mecab lib
 %{?with_mecab: %global mecab_option -DWITH_MECAB=%{with_mecab}}
