Do not set RPATH
Resolves: rhbz#1967200
This commit is contained in:
parent
b7f22e2de4
commit
b00e70fa17
42
openscap-1.3.6-rpath-pr-1765.patch
Normal file
42
openscap-1.3.6-rpath-pr-1765.patch
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
From 5f8879927fa34827f1b367eac311845e6ebec9a7 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= <jcerny@redhat.com>
|
||||||
|
Date: Thu, 10 Jun 2021 13:41:25 +0200
|
||||||
|
Subject: [PATCH] Do not set Rpath
|
||||||
|
|
||||||
|
See: https://docs.fedoraproject.org/en-US/packaging-guidelines/#_beware_of_rpath
|
||||||
|
|
||||||
|
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1967200
|
||||||
|
---
|
||||||
|
CMakeLists.txt | 18 ------------------
|
||||||
|
1 file changed, 18 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index c70ba29bf..cc7b5e005 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -482,25 +482,7 @@ else()
|
||||||
|
endif()
|
||||||
|
set(OSCAP_TEMP_DIR "/tmp" CACHE STRING "use different temporary directory to execute sce scripts (default=/tmp)")
|
||||||
|
|
||||||
|
-# ---------- RPATHS for linking
|
||||||
|
|
||||||
|
-# see https://cmake.org/Wiki/CMake_RPATH_handling
|
||||||
|
-
|
||||||
|
-# use, i.e. don't skip the full RPATH for the build tree
|
||||||
|
-set(CMAKE_SKIP_BUILD_RPATH FALSE)
|
||||||
|
-
|
||||||
|
-# when building, don't use the install RPATH already
|
||||||
|
-# (but later on when installing)
|
||||||
|
-set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
|
||||||
|
-
|
||||||
|
-set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR})
|
||||||
|
-
|
||||||
|
-# add the automatically determined parts of the RPATH
|
||||||
|
-# which point to directories outside the build tree to the install RPATH
|
||||||
|
-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
|
||||||
|
-
|
||||||
|
-# Turn on RPATH for OSX for policy warning
|
||||||
|
-set(CMAKE_MACOSX_RPATH ON)
|
||||||
|
# ---------- CONFIGURATION
|
||||||
|
|
||||||
|
configure_file("config.h.in" "config.h")
|
@ -1,15 +1,13 @@
|
|||||||
# This needs upstream fixes and we need this to rebuild in the meantime
|
|
||||||
%global __brp_check_rpaths %{nil}
|
|
||||||
|
|
||||||
Name: openscap
|
Name: openscap
|
||||||
Version: 1.3.5
|
Version: 1.3.5
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Summary: Set of open source libraries enabling integration of the SCAP line of standards
|
Summary: Set of open source libraries enabling integration of the SCAP line of standards
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
URL: http://www.open-scap.org/
|
URL: http://www.open-scap.org/
|
||||||
Source0: https://github.com/OpenSCAP/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz
|
Source0: https://github.com/OpenSCAP/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz
|
||||||
Patch1: openscap-1.3.6-waive-hugetables-pr-1745.patch
|
Patch1: openscap-1.3.6-waive-hugetables-pr-1745.patch
|
||||||
|
Patch2: openscap-1.3.6-rpath-pr-1765.patch
|
||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
BuildRequires: cmake >= 2.6
|
BuildRequires: cmake >= 2.6
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
@ -206,6 +204,9 @@ pathfix.py -i %{__python3} -p -n $RPM_BUILD_ROOT%{_bindir}/scap-as-rpm
|
|||||||
%{_mandir}/man8/oscap-podman.8*
|
%{_mandir}/man8/oscap-podman.8*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jun 25 2021 Jan Černý <jcerny@redhat.com> - 1:1.3.5-5
|
||||||
|
- Do not set RPATH (rhbz#1967200)
|
||||||
|
|
||||||
* Wed Jun 16 2021 Stephen Gallagher <sgallagh@redhat.com> - 1:1.3.5-4
|
* Wed Jun 16 2021 Stephen Gallagher <sgallagh@redhat.com> - 1:1.3.5-4
|
||||||
- Skip RPATH check temporarily
|
- Skip RPATH check temporarily
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user