[PATCH] Remove unused patchelf inputs

[PATCH] Remove unused patchelf inputs

[Mark H Weaver]

[-- Attachment #1: Type: text/plain, Size: 315 bytes --]

I was puzzled to find three occurrences of 'patchelf' in packages that
do not appear to use it.  The packages build successfully with this
patch, and I don't see any missing rpaths in the resulting outputs.  I
also don't see anything that would use 'patchelf' in those packages.

Am I missing something?

    Mark


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: [PATCH] Remove unused patchelf inputs --]
[-- Type: text/x-patch, Size: 1807 bytes --]

From 232b960c3a1a56c5c7f68b7d4859be7a250f0eab Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Sun, 22 Mar 2015 23:56:19 -0400
Subject: [PATCH] Remove unused patchelf inputs.

* gnu/packages/maths.scm (lapack, gmsh), gnu/packages/ssh.scm (libssh): Remove
  unused patchelf from native-inputs.
---
 gnu/packages/maths.scm | 2 --
 gnu/packages/ssh.scm   | 1 -
 2 files changed, 3 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index b6d3ed3..81390c3 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -255,7 +255,6 @@ large scale eigenvalue problems.")
         "0lk3f97i9imqascnlf6wr5mjpyxqcdj73pgj97dj2mgvyg9z1n4s"))))
     (build-system cmake-build-system)
     (home-page "http://www.netlib.org/lapack/")
-    (native-inputs `(("patchelf" ,patchelf))) ;for augment-rpath
     (inputs `(("fortran" ,gfortran-4.8)
               ("python" ,python-2)))
     (arguments
@@ -407,7 +406,6 @@ files.")
        ;; Remove non-free METIS code
        '(delete-file-recursively "contrib/Metis"))))
     (build-system cmake-build-system)
-    (native-inputs `(("patchelf" ,patchelf))) ;for augment-rpath
     (propagated-inputs
      `(("fltk" ,fltk)
        ("gfortran" ,gfortran-4.8)
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index 0148b25..1069785 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -72,7 +72,6 @@
                ;; fields of 'gcry_thread_cbs' that are now private:
                ;; src/threads.c:72:26: error: 'struct gcry_thread_cbs' has no member named 'mutex_init'
               ("libgcrypt", libgcrypt-1.5)))
-    (native-inputs `(("patchelf" ,patchelf)))
     (synopsis "SSH client library")
     (description
      "libssh is a C library implementing the SSHv2 and SSHv1 protocol for
-- 
2.2.1

Re: [PATCH] Remove unused patchelf inputs

[Ludovic Courtès]

Mark H Weaver <mhw@netris.org> skribis:

> I was puzzled to find three occurrences of 'patchelf' in packages that
> do not appear to use it.  The packages build successfully with this
> patch, and I don't see any missing rpaths in the resulting outputs.  I
> also don't see anything that would use 'patchelf' in those packages.
>
> Am I missing something?

This patch looks good to me.  For libssh, for instance, ‘patchelf’ is a
leftover from a time when it was used to fiddle with the RUNPATH of
libssh (commit deed349.)  Same for lapack (commit 57e544e8.)

This special RUNPATH-handling code was removed by 06ed598.

Thank you,
Ludo’.