rpms
/
llvm
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Disable rpath on install LLVM and related sub-projects 

Rather than using chrpath, we can just modify LLVM's cmake code to
not set rpath when installing.  Other llvm sub-projects like
clang, lld, lldb, etc. use this same cmake code so disbaling rpath
here will disable it for all projects.
This commit is contained in:
Tom Stellard 2018-09-13 17:13:05 +00:00
parent f04627996a
commit f0b94fc76d
2 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
0001-Don-t-set-rpath-when-installing.patch Normal file
View File

@ -0,0 +1,24 @@
From e67ace2ecb42c24e124f1738dc67b22055a22500 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Thu, 13 Sep 2018 10:10:08 -0700
Subject: [PATCH] Don't set rpath when installing
---
cmake/modules/AddLLVM.cmake | 1 +
1 file changed, 1 insertion(+)
diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake
index ce2057f..de309b5 100644
--- a/cmake/modules/AddLLVM.cmake
+++ b/cmake/modules/AddLLVM.cmake
@@ -1621,6 +1621,7 @@ function(llvm_codesign name)
endfunction()
function(llvm_setup_rpath name)
+ return()
if(CMAKE_INSTALL_RPATH)
return()
endif()
--
1.8.3.1

14
llvm.spec
View File

@ -51,7 +51,7 @@
Name: %{pkg_name}
Version: %{maj_ver}.%{min_ver}.%{patch_ver}
Release: 0.14.rc%{rc_ver}%{?dist}
Release: 0.15.rc%{rc_ver}%{?dist}
Summary: The Low Level Virtual Machine
License: NCSA
@ -67,6 +67,7 @@ Patch12: 0001-unittests-Don-t-install-TestPlugin.so.patch
# removes the preferences for python2, so we can make sure we always use
# python3.
Patch14: 0001-CMake-Don-t-prefer-python2.7.patch
Patch15: 0001-Don-t-set-rpath-when-installing.patch
BuildRequires: gcc
BuildRequires: gcc-c++
@ -89,7 +90,6 @@ BuildRequires: valgrind-devel
BuildRequires: libedit-devel
# We need python3-devel for pathfix.py.
BuildRequires: python3-devel
BuildRequires: chrpath
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
@ -277,13 +277,6 @@ cp -R _build/unittests %{buildroot}%{llvm_bindir}/
# FIXME: Can't figure out how to make the find command succeed.
find %{buildroot}%{llvm_bindir} -ignore_readdir_race -iname 'cmake*' -exec rm -Rf '{}' ';' || true
# Remove rpath
chrpath --delete %{buildroot}%{_bindir}/*
chrpath --delete %{buildroot}%{_libdir}/*.so*
for f in `find %{buildroot}%{llvm_bindir} -executable -type f`; do
chrpath --delete $f
done
%else
# Add version suffix to binaries
@ -425,6 +418,9 @@ fi
%endif
%changelog
* Thu Sep 13 2018 Tom Stellard <tstellar@redhat.com> - 7.0.0-0.15.rc3
- Disable rpath on install LLVM and related sub-projects
* Wed Sep 12 2018 Tom Stellard <tstellar@redhat.com> - 7.0.0-0.14.rc3
- Remove rpath from executables and libraries