From: Artem Savkov <[email protected]>

redhat/spec: Add EXTRA_CXXFLAGS to bpf samples and selftests make

JIRA: https://issues.redhat.com/browse/RHEL-48593

Upstream status: RHEL-only

This is needed for proper feature detection and linking with PIE llvm.

Signed-off-by: Artem Savkov <[email protected]>
Signed-off-by: Viktor Malik <[email protected]>
Signed-off-by: Gregory Bell <[email protected]>

diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -3170,7 +3170,7 @@ if [ ! -f include/generated/autoconf.h ]; then
 fi
 
 %{log_msg "build samples/bpf"}
-%{make} %{?_smp_mflags} ARCH=$Arch V=1 M=samples/bpf/ 
VMLINUX_H="${RPM_VMLINUX_H}" || true
+%{make} %{?_smp_mflags} EXTRA_CXXFLAGS="${RPM_OPT_FLAGS}" ARCH=$Arch V=1 
M=samples/bpf/ VMLINUX_H="${RPM_VMLINUX_H}" || true
 
 pushd tools/testing/selftests
 # We need to install here because we need to call make with ARCH set which
@@ -3182,7 +3182,7 @@ pushd tools/testing/selftests
 %endif
 
 %{log_msg "main selftests compile"}
-%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf cgroup mm net 
net/forwarding net/mptcp net/netfilter tc-testing memfd drivers/net/bonding 
iommu cachestat" SKIP_TARGETS="" $force_targets 
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}" 
install
+%{make} %{?_smp_mflags} EXTRA_CXXFLAGS="${RPM_OPT_FLAGS}" ARCH=$Arch V=1 
TARGETS="bpf cgroup mm net net/forwarding net/mptcp net/netfilter tc-testing 
memfd drivers/net/bonding iommu cachestat" SKIP_TARGETS="" $force_targets 
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}" 
install
 
 %ifarch %{klptestarches}
        # kernel livepatching selftest test_modules will build against

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3738

-- 
_______________________________________________
kernel mailing list -- [email protected]
To unsubscribe send an email to [email protected]
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/[email protected]
Do not reply to spam, report it: 
https://pagure.io/fedora-infrastructure/new_issue

Reply via email to