diff options
| author | Iikka Eklund <iikka.eklund@theqtcompany.com> | 2015-02-10 15:25:54 +0200 |
|---|---|---|
| committer | Matti Paaso <matti.paaso@theqtcompany.com> | 2015-02-13 08:15:35 +0000 |
| commit | d576aef53742dc825fa75055031baf40814abe84 (patch) | |
| tree | 29d809b4efde999cf8c118e094afa2879ca2c1b7 /packaging-tools | |
| parent | 4d2e3bfb9c2bc84cfb2b4af2957592e1849a388a (diff) | |
Check for RPATH and RUNPATH when patching packages
Binaries compiled with Red Hat may have RUNPATH defined in addition to
RPATH. Take that into account which files need to be patched.
Change-Id: Idb9a7845a11b6d55e0b33249b0f1020d56e1a91c
Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
Reviewed-by: Matti Paaso <matti.paaso@theqtcompany.com>
Diffstat (limited to 'packaging-tools')
| -rw-r--r-- | packaging-tools/bldinstallercommon.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packaging-tools/bldinstallercommon.py b/packaging-tools/bldinstallercommon.py index 7b879d576..37ac082e8 100644 --- a/packaging-tools/bldinstallercommon.py +++ b/packaging-tools/bldinstallercommon.py @@ -598,7 +598,7 @@ def requires_rpath(file_path): if IS_LINUX_PLATFORM or IS_SOLARIS_PLATFORM: if not is_executable(file_path): return False - return (re.search(r':*.R..PATH=', + return (re.search(r':*.R.*PATH=', subprocess.Popen(['chrpath', '-l', file_path], stdout=subprocess.PIPE).stdout.read()) is not None) return False @@ -611,7 +611,7 @@ def sanity_check_rpath_max_length(file_path, new_rpath): if IS_LINUX_PLATFORM or IS_SOLARIS_PLATFORM: if not is_executable(file_path): return False - result = re.search(r':*.R..PATH=.*', subprocess.Popen(['chrpath', '-l', file_path], stdout=subprocess.PIPE).stdout.read()) + result = re.search(r':*.R.*PATH=.*', subprocess.Popen(['chrpath', '-l', file_path], stdout=subprocess.PIPE).stdout.read()) if not result: print '*** No RPath found from given file: ' + file_path else: |