diff options
author | Vladimír Čunát <v@cunat.cz> | 2020-06-07 09:38:37 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2020-06-10 08:31:25 +0200 |
commit | 2988780eb5f31912917270ad330765761c1f66c8 (patch) | |
tree | a6eef9b32aaacb2651e41b778073e87e07252440 /pkgs/development/tools/misc/autogen/default.nix | |
parent | acb53e069824a0ae92e81239963e79e5e3088fb8 (diff) | |
download | nixpkgs-2988780eb5f31912917270ad330765761c1f66c8.tar nixpkgs-2988780eb5f31912917270ad330765761c1f66c8.tar.gz nixpkgs-2988780eb5f31912917270ad330765761c1f66c8.tar.bz2 nixpkgs-2988780eb5f31912917270ad330765761c1f66c8.tar.lz nixpkgs-2988780eb5f31912917270ad330765761c1f66c8.tar.xz nixpkgs-2988780eb5f31912917270ad330765761c1f66c8.tar.zst nixpkgs-2988780eb5f31912917270ad330765761c1f66c8.zip |
autogen: 5.18.12 -> 5.18.16
I re-checked that pkgsCross.aarch64-multiplatform.autogen builds. https://github.com/NixOS/nixpkgs/pull/89388#issuecomment-639155770
Diffstat (limited to 'pkgs/development/tools/misc/autogen/default.nix')
-rw-r--r-- | pkgs/development/tools/misc/autogen/default.nix | 61 |
1 files changed, 32 insertions, 29 deletions
diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index 65c4f317405..2911855e702 100644 --- a/pkgs/development/tools/misc/autogen/default.nix +++ b/pkgs/development/tools/misc/autogen/default.nix @@ -1,34 +1,39 @@ -{ stdenv, buildPackages, fetchurl, which, pkgconfig, perl, guile, libxml2 }: +{ stdenv, buildPackages, fetchurl, autoreconfHook, which, pkgconfig, perl, guile, libxml2 }: stdenv.mkDerivation rec { pname = "autogen"; - version = "5.18.12"; + version = "5.18.16"; src = fetchurl { url = "mirror://gnu/autogen/rel${version}/autogen-${version}.tar.xz"; - sha256 = "1n5zq4872sakvz9c7ncsdcfp0z8rsybsxvbmhkpbd19ii0pacfxy"; + sha256 = "16mlbdys8q4ckxlvxyhwkdnh1ay9f6g0cyp1kylkpalgnik398gq"; }; - outputs = [ "bin" "dev" "lib" "out" "man" "info" ]; - - patches = [ - # Temporary, so builds with a prefixed pkg-config (like cross builds) work. - # - # https://savannah.gnu.org/support/?109050 was supposed to fix this, but - # the generated configure script mysteriously still contained hard-coded - # pkg-config. I tried regenerating it, but that didn't help. Only - # https://git.savannah.gnu.org/cgit/autogen.git/commit/?h=5cbe233387d7f7b36752736338d1cd4f71287daa, - # in the next release, finally fixes this, by getting rid of some - # metaprogramming of the autoconf m4 metaprogram! There evidentally was - # some sort escaping error such that the `PKG_CONFIG` check got evaluated - # before `configure` was generated. - # - # Remove this when the version is bumped - ./pkg-config-use-var.patch + patches = let + dp = { ver ? "1%255.18.16-4", pname, name ? (pname + ".diff"), sha256 }: fetchurl { + url = "https://salsa.debian.org/debian/autogen/-/raw/debian/${ver}" + + "/debian/patches/${pname}.diff?inline=false"; + inherit name sha256; + }; + in [ + (dp { + pname = "20_no_Werror"; + sha256 = "08z4s2ifiqyaacjpd9pzr59w8m4j3548kkaq1bwvp2gjn29m680x"; + }) + (dp { + pname = "30_ag_macros.m4_syntax_error"; + sha256 = "1z8vmbwbkz3505wd33i2xx91mlf8rwsa7klndq37nw821skxwyh3"; + }) + (dp { + pname = "31_allow_overriding_AGexe_for_crossbuild"; + sha256 = "0h9wkc9bqb509knh8mymi43hg6n6sxg2lixvjlchcx7z0j7p8xkf"; + }) ]; + outputs = [ "bin" "dev" "lib" "out" "man" "info" ]; + nativeBuildInputs = [ - which pkgconfig perl + which pkgconfig perl autoreconfHook/*patches applied*/ ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # autogen needs a build autogen when cross-compiling buildPackages.buildPackages.autogen buildPackages.texinfo @@ -45,13 +50,7 @@ stdenv.mkDerivation rec { #"MAKEINFO=${buildPackages.texinfo}/bin/makeinfo" ]; - postPatch = '' - # Fix a broken sed expression used for detecting the minor - # version of guile we are using - sed -i "s,sed '.*-I.*',sed 's/\\\(^\\\| \\\)-I/\\\1/g',g" configure - - substituteInPlace pkg/libopts/mklibsrc.sh --replace /tmp $TMPDIR - ''; + #doCheck = true; # not reliable postInstall = '' mkdir -p $dev/bin @@ -62,9 +61,13 @@ stdenv.mkDerivation rec { sed -e "s|$bin/bin|/no-such-autogen-bin-path|" -i $f sed -e "s|$lib/lib|/no-such-autogen-lib-path|" -i $f done - ''; - #doCheck = true; # 2 tests fail because of missing /dev/tty + # remove /build/** from RPATHs + for f in "$bin"/bin/*; do + local nrp="$(patchelf --print-rpath "$f" | sed -E 's@(:|^)/build/[^:]*:@\1@g')" + patchelf --set-rpath "$nrp" "$f" + done + ''; meta = with stdenv.lib; { description = "Automated text and program generation tool"; |