amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: patchelf: Update to 0.8.

Browse source 
* gnu/packages/elf.scm (patchelf): Update to 0.8.
* gnu/packages/patches/patchelf-page-size.patch: Adapt to new version.
This commit is contained in:
Mark H Weaver 2015-01-06 21:38:35 +00:00
parent c93d7edda3
commit fd19df7252
2 changed files with 20 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gnu/packages/elf.scm
View file

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -87,7 +88,7 @@ addr2line, and more.")
(define-public patchelf (define-public patchelf
(package (package
(name "patchelf") (name "patchelf")
(version "0.6") (version "0.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -96,7 +97,7 @@ addr2line, and more.")
"/patchelf-" version ".tar.bz2")) "/patchelf-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"00bw29vdsscsili65wcb5ay0gvg1w0ljd00sb5xc6br8bylpyzpw")) "1rqpg84wrd3fa16wa9vqdvasnc05yz49w207cz1l0wrl4k8q97y9"))
(patches (list (search-patch "patchelf-page-size.patch"))))) (patches (list (search-patch "patchelf-page-size.patch")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "http://nixos.org/patchelf.html") (home-page "http://nixos.org/patchelf.html")

33
gnu/packages/patches/patchelf-page-size.patch
View file

@ -28,42 +28,43 @@ Patch by Mark H Weaver <mhw@netris.org>.
#endif #endif
--- patchelf/tests/no-rpath.sh.orig 1969-12-31 19:00:01.000000000 -0500 --- patchelf/tests/no-rpath.sh.orig 2014-01-14 08:17:47.000000000 -0500
+++ patchelf/tests/no-rpath.sh 2014-02-16 20:44:12.036376953 -0500 +++ patchelf/tests/no-rpath.sh 2015-01-06 18:31:53.418172797 -0500
@@ -1,22 +1,22 @@ @@ -1,23 +1,23 @@
#! /bin/sh -e #! /bin/sh -e
SCRATCH=scratch/$(basename $0 .sh)
-rm -rf scratch -rm -rf ${SCRATCH}
-mkdir -p scratch -mkdir -p ${SCRATCH}
+if [ "$(uname -m)" = i686 -a "$(uname -s)" = Linux ]; then +if [ "$(uname -m)" = i686 -a "$(uname -s)" = Linux ]; then
+ rm -rf scratch + rm -rf ${SCRATCH}
+ mkdir -p scratch + mkdir -p ${SCRATCH}
-cp no-rpath scratch/ -cp ${srcdir}/no-rpath ${SCRATCH}/
+ cp 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 -if test -n "$oldRPath"; then exit 1; fi
-../src/patchelf \ -../src/patchelf \
- --set-interpreter "$(../src/patchelf --print-interpreter ../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
+ oldRPath=$(../src/patchelf --print-rpath scratch/no-rpath) + oldRPath=$(../src/patchelf --print-rpath ${SCRATCH}/no-rpath)
+ if test -n "$oldRPath"; then exit 1; fi + if test -n "$oldRPath"; then exit 1; fi
+ ../src/patchelf \ + ../src/patchelf \
+ --set-interpreter "$(../src/patchelf --print-interpreter ../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 -if ! echo "$newRPath" | grep -q '/foo:/bar'; then
- echo "incomplete RPATH" - echo "incomplete RPATH"
- exit 1 - exit 1
-fi -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 + if ! echo "$newRPath" | grep -q '/foo:/bar'; then
+ echo "incomplete RPATH" + echo "incomplete RPATH"
+ exit 1 + exit 1
+ fi + fi
-if [ "$(uname -m)" = i686 -a "$(uname -s)" = Linux ]; then -if [ "$(uname -m)" = i686 -a "$(uname -s)" = Linux ]; then
cd scratch && ./no-rpath cd ${SCRATCH} && ./no-rpath
fi fi