diff options
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | patchelf.1 | 2 | ||||
| -rw-r--r-- | patchelf.spec.in | 2 | ||||
| -rw-r--r-- | release.nix | 32 | ||||
| -rw-r--r-- | src/patchelf.cc | 1 |
5 files changed, 18 insertions, 21 deletions
@@ -1,4 +1,4 @@ -PatchELF is a simple utility for modifing existing ELF executables and +PatchELF is a simple utility for modifying existing ELF executables and libraries. In particular, it can do the following: * Change the dynamic loader ("ELF interpreter") of executables: @@ -75,7 +75,7 @@ Replaces a declared dependency on a dynamic library with another one (DT_NEEDED) This option can be give multiple times. .IP "--remove-needed LIBRARY" -Removes a declared depency on LIBRARY (DT_NEEDED entry). This +Removes a declared dependency on LIBRARY (DT_NEEDED entry). This option can be given multiple times. .IP "--no-default-lib" diff --git a/patchelf.spec.in b/patchelf.spec.in index a361554..d0f326f 100644 --- a/patchelf.spec.in +++ b/patchelf.spec.in @@ -12,7 +12,7 @@ Prefix: /usr %description -PatchELF is a simple utility for modifing existing ELF executables and +PatchELF is a simple utility for modifying existing ELF executables and libraries. It can change the dynamic loader ("ELF interpreter") of executables and change the RPATH of executables and libraries. diff --git a/release.nix b/release.nix index 1b6c67c..8aa787b 100644 --- a/release.nix +++ b/release.nix @@ -32,7 +32,7 @@ let }; - build = pkgs.lib.genAttrs [ "x86_64-linux" "i686-linux" /* "x86_64-freebsd" "i686-freebsd" "x86_64-darwin" "i686-solaris" "i686-cygwin" */ ] (system: + build = pkgs.lib.genAttrs [ "x86_64-linux" "i686-linux" "aarch64-linux" /* "x86_64-freebsd" "i686-freebsd" "x86_64-darwin" "i686-solaris" "i686-cygwin" */ ] (system: with import <nixpkgs> { inherit system; }; @@ -41,16 +41,14 @@ let src = tarball; doCheck = !stdenv.isDarwin && system != "i686-cygwin" && system != "i686-solaris"; buildInputs = lib.optionals stdenv.isLinux [ acl attr ]; - isReproducible = true; + isReproducible = system != "aarch64-linux"; # ARM machines are still on Nix 1.11 }); - rpm_fedora20i386 = makeRPM_i686 (diskImages: diskImages.fedora20i386); - rpm_fedora20x86_64 = makeRPM_x86_64 (diskImages: diskImages.fedora20x86_64); - rpm_fedora21i386 = makeRPM_i686 (diskImages: diskImages.fedora21i386); - rpm_fedora21x86_64 = makeRPM_x86_64 (diskImages: diskImages.fedora21x86_64); - rpm_fedora23i386 = makeRPM_i686 (diskImages: diskImages.fedora23i386); - rpm_fedora23x86_64 = makeRPM_x86_64 (diskImages: diskImages.fedora23x86_64); + rpm_fedora24i386 = makeRPM_i686 (diskImages: diskImages.fedora24i386); + rpm_fedora24x86_64 = makeRPM_x86_64 (diskImages: diskImages.fedora24x86_64); + rpm_fedora25i386 = makeRPM_i686 (diskImages: diskImages.fedora25i386); + rpm_fedora25x86_64 = makeRPM_x86_64 (diskImages: diskImages.fedora25x86_64); deb_debian7i386 = makeDeb_i686 (diskImages: diskImages.debian7i386); deb_debian7x86_64 = makeDeb_x86_64 (diskImages: diskImages.debian7x86_64); @@ -59,12 +57,10 @@ let deb_ubuntu1404i386 = makeDeb_i686 (diskImages: diskImages.ubuntu1404i386); deb_ubuntu1404x86_64 = makeDeb_x86_64 (diskImages: diskImages.ubuntu1404x86_64); - deb_ubuntu1410i386 = makeDeb_i686 (diskImages: diskImages.ubuntu1410i386); - deb_ubuntu1410x86_64 = makeDeb_x86_64 (diskImages: diskImages.ubuntu1410x86_64); - deb_ubuntu1504i386 = makeDeb_i686 (diskImages: diskImages.ubuntu1504i386); - deb_ubuntu1504x86_64 = makeDeb_x86_64 (diskImages: diskImages.ubuntu1504x86_64); - deb_ubuntu1510i386 = makeDeb_i686 (diskImages: diskImages.ubuntu1510i386); - deb_ubuntu1510x86_64 = makeDeb_x86_64 (diskImages: diskImages.ubuntu1510x86_64); + deb_ubuntu1604i386 = makeDeb_i686 (diskImages: diskImages.ubuntu1604i386); + deb_ubuntu1604x86_64 = makeDeb_x86_64 (diskImages: diskImages.ubuntu1604x86_64); + deb_ubuntu1610i386 = makeDeb_i686 (diskImages: diskImages.ubuntu1610i386); + deb_ubuntu1610x86_64 = makeDeb_x86_64 (diskImages: diskImages.ubuntu1610x86_64); release = pkgs.releaseTools.aggregate @@ -76,12 +72,12 @@ let #build.x86_64-freebsd #build.i686-freebsd #build.x86_64-darwin - rpm_fedora23i386 - rpm_fedora23x86_64 + rpm_fedora25i386 + rpm_fedora25x86_64 deb_debian8i386 deb_debian8x86_64 - deb_ubuntu1510i386 - deb_ubuntu1510x86_64 + deb_ubuntu1610i386 + deb_ubuntu1610x86_64 ]; meta.description = "Release-critical builds"; }; diff --git a/src/patchelf.cc b/src/patchelf.cc index cbd36c0..f3c1b84 100644 --- a/src/patchelf.cc +++ b/src/patchelf.cc @@ -24,6 +24,7 @@ #include <memory> #include <sstream> #include <limits> +#include <stdexcept> #include <cstdlib> #include <cstdio> |