aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches/patchelf-page-size.patch
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2015-01-06 21:38:35 +0000
committerMark H Weaver <mhw@netris.org>2015-01-06 18:40:42 -0500
commitfd19df72528a6ee7abd934da08c669094006fa2a (patch)
tree2ba0f0821ec241d4a64497787972bf47faa7ed3a /gnu/packages/patches/patchelf-page-size.patch
parentc93d7edda30efc4a0245e36148aff5717c7a1cae (diff)
downloadguix-fd19df72528a6ee7abd934da08c669094006fa2a.tar
guix-fd19df72528a6ee7abd934da08c669094006fa2a.tar.gz
gnu: patchelf: Update to 0.8.
* gnu/packages/elf.scm (patchelf): Update to 0.8. * gnu/packages/patches/patchelf-page-size.patch: Adapt to new version.
Diffstat (limited to 'gnu/packages/patches/patchelf-page-size.patch')
-rw-r--r--gnu/packages/patches/patchelf-page-size.patch33
1 files changed, 17 insertions, 16 deletions
diff --git a/gnu/packages/patches/patchelf-page-size.patch b/gnu/packages/patches/patchelf-page-size.patch
index 2528b604e5..1c14047512 100644
--- a/gnu/packages/patches/patchelf-page-size.patch
+++ b/gnu/packages/patches/patchelf-page-size.patch
@@ -28,42 +28,43 @@ Patch by Mark H Weaver <mhw@netris.org>.
#endif
---- patchelf/tests/no-rpath.sh.orig 1969-12-31 19:00:01.000000000 -0500
-+++ patchelf/tests/no-rpath.sh 2014-02-16 20:44:12.036376953 -0500
-@@ -1,22 +1,22 @@
+--- patchelf/tests/no-rpath.sh.orig 2014-01-14 08:17:47.000000000 -0500
++++ patchelf/tests/no-rpath.sh 2015-01-06 18:31:53.418172797 -0500
+@@ -1,23 +1,23 @@
#! /bin/sh -e
+ SCRATCH=scratch/$(basename $0 .sh)
--rm -rf scratch
--mkdir -p scratch
+-rm -rf ${SCRATCH}
+-mkdir -p ${SCRATCH}
+if [ "$(uname -m)" = i686 -a "$(uname -s)" = Linux ]; then
-+ rm -rf scratch
-+ mkdir -p scratch
++ rm -rf ${SCRATCH}
++ mkdir -p ${SCRATCH}
--cp no-rpath scratch/
-+ cp no-rpath scratch/
+-cp ${srcdir}/no-rpath ${SCRATCH}/
++ cp ${srcdir}/no-rpath ${SCRATCH}/
--oldRPath=$(../src/patchelf --print-rpath scratch/no-rpath)
+-oldRPath=$(../src/patchelf --print-rpath ${SCRATCH}/no-rpath)
-if test -n "$oldRPath"; then exit 1; fi
-../src/patchelf \
- --set-interpreter "$(../src/patchelf --print-interpreter ../src/patchelf)" \
-- --set-rpath /foo:/bar:/xxxxxxxxxxxxxxx scratch/no-rpath
-+ oldRPath=$(../src/patchelf --print-rpath scratch/no-rpath)
+- --set-rpath /foo:/bar:/xxxxxxxxxxxxxxx ${SCRATCH}/no-rpath
++ oldRPath=$(../src/patchelf --print-rpath ${SCRATCH}/no-rpath)
+ if test -n "$oldRPath"; then exit 1; fi
+ ../src/patchelf \
+ --set-interpreter "$(../src/patchelf --print-interpreter ../src/patchelf)" \
-+ --set-rpath /foo:/bar:/xxxxxxxxxxxxxxx scratch/no-rpath
++ --set-rpath /foo:/bar:/xxxxxxxxxxxxxxx ${SCRATCH}/no-rpath
--newRPath=$(../src/patchelf --print-rpath scratch/no-rpath)
+-newRPath=$(../src/patchelf --print-rpath ${SCRATCH}/no-rpath)
-if ! echo "$newRPath" | grep -q '/foo:/bar'; then
- echo "incomplete RPATH"
- exit 1
-fi
-+ newRPath=$(../src/patchelf --print-rpath scratch/no-rpath)
++ newRPath=$(../src/patchelf --print-rpath ${SCRATCH}/no-rpath)
+ if ! echo "$newRPath" | grep -q '/foo:/bar'; then
+ echo "incomplete RPATH"
+ exit 1
+ fi
-if [ "$(uname -m)" = i686 -a "$(uname -s)" = Linux ]; then
- cd scratch && ./no-rpath
+ cd ${SCRATCH} && ./no-rpath
fi