Accepting request 383163 from devel:tools:building
1 OBS-URL: https://build.opensuse.org/request/show/383163 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/patchelf?expand=0&rev=9
This commit is contained in:
commit
d7cbde2ef0
39
no-rpath-prebuilt.patch
Normal file
39
no-rpath-prebuilt.patch
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
From: Felipe Sateler <fsateler@debian.org>
|
||||||
|
Date: Mon, 29 Feb 2016 17:29:35 -0300
|
||||||
|
Subject: no-rpath-prebuild: force pagesize to 4096 on prebuilt binaries
|
||||||
|
|
||||||
|
They all have that page size.
|
||||||
|
---
|
||||||
|
tests/no-rpath-prebuild.sh | 9 +++++----
|
||||||
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tests/no-rpath-prebuild.sh b/tests/no-rpath-prebuild.sh
|
||||||
|
index d059dda..aa27b7a 100755
|
||||||
|
--- a/tests/no-rpath-prebuild.sh
|
||||||
|
+++ b/tests/no-rpath-prebuild.sh
|
||||||
|
@@ -1,6 +1,7 @@
|
||||||
|
#! /bin/sh -e
|
||||||
|
set -x
|
||||||
|
ARCH="$1"
|
||||||
|
+PAGESIZE=4096
|
||||||
|
|
||||||
|
if [ -z "$ARCH" ]; then
|
||||||
|
ARCH=$(basename $0 .sh | sed -e 's/.*-//')
|
||||||
|
@@ -25,13 +26,13 @@ mkdir -p ${SCRATCH}
|
||||||
|
|
||||||
|
cp $no_rpath_bin ${SCRATCH}/no-rpath
|
||||||
|
|
||||||
|
-oldRPath=$(../src/patchelf --print-rpath ${SCRATCH}/no-rpath)
|
||||||
|
+oldRPath=$(../src/patchelf --page-size ${PAGESIZE} --print-rpath ${SCRATCH}/no-rpath)
|
||||||
|
if test -n "$oldRPath"; then exit 1; fi
|
||||||
|
-../src/patchelf \
|
||||||
|
- --set-interpreter "$(../src/patchelf --print-interpreter ../src/patchelf)" \
|
||||||
|
+../src/patchelf --page-size ${PAGESIZE} \
|
||||||
|
+ --set-interpreter "$(../src/patchelf --page-size ${PAGESIZE} --print-interpreter ../src/patchelf)" \
|
||||||
|
--set-rpath /foo:/bar:/xxxxxxxxxxxxxxx ${SCRATCH}/no-rpath
|
||||||
|
|
||||||
|
-newRPath=$(../src/patchelf --print-rpath ${SCRATCH}/no-rpath)
|
||||||
|
+newRPath=$(../src/patchelf --page-size ${PAGESIZE} --print-rpath ${SCRATCH}/no-rpath)
|
||||||
|
if ! echo "$newRPath" | grep -q '/foo:/bar'; then
|
||||||
|
echo "incomplete RPATH"
|
||||||
|
exit 1
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Apr 1 22:53:20 UTC 2016 - dvaleev@suse.com
|
||||||
|
|
||||||
|
- Enable exluded architectures.
|
||||||
|
Fixed by debian patch no-rpath-prebuilt.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Mar 20 10:08:24 UTC 2016 - mpluskal@suse.com
|
Sun Mar 20 10:08:24 UTC 2016 - mpluskal@suse.com
|
||||||
|
|
||||||
|
@ -24,9 +24,8 @@ License: GPL-3.0
|
|||||||
Group: Development/Libraries/C and C++
|
Group: Development/Libraries/C and C++
|
||||||
Url: http://nixos.org/patchelf.html
|
Url: http://nixos.org/patchelf.html
|
||||||
Source: http://releases.nixos.org/%{name}/%{name}-%{version}/%{name}-%{version}.tar.bz2
|
Source: http://releases.nixos.org/%{name}/%{name}-%{version}/%{name}-%{version}.tar.bz2
|
||||||
|
Patch0: no-rpath-prebuilt.patch
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
# Tests fail here
|
|
||||||
ExcludeArch: ppc ppc64 ppc64le %arm aarch64
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
PatchELF is a simple utility for modifing existing ELF executables and
|
PatchELF is a simple utility for modifing existing ELF executables and
|
||||||
@ -35,6 +34,7 @@ executables and change the RPATH of executables and libraries.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure
|
%configure
|
||||||
|
Loading…
x
Reference in New Issue
Block a user