Skip to content

Commit

Permalink
libtool,libtool_1_5: don't fix libtool
Browse files Browse the repository at this point in the history
For the same reason we disable shebang patching in these derivations,
we want to disable the patching of libtool scripts stdenv does.

Otherwise, libtool will install scripts into other packages that are
already "fixed", but for the environment libtool was built in.  These
scripts won't be fixed properly by stdenv anymore, because it will
think they were already fixed.

This fixes the build of pkgsStatic.libwebp, which was failing because
its libtool script wasn't being patched properly.

Another problem "fixing" the scripts in the libtool package would
cause is that package tarballs generated on NixOS would contain
libtool scripts that didn't make sense on other distros.

I've tested this change by building pkgsStatic.libwebp, which now
works, as well as by testing the build of the bootstrap files for
mips64el to make sure that didn't regress from 97c4382
("fixLibtool(): patch ./configure, add `file` to common-path.nix").
  • Loading branch information
alyssais committed Jul 6, 2022
1 parent 7c1c19b commit 4195ac3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions pkgs/development/tools/misc/libtool/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
# Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
# "fixed" path in generated files!
dontPatchShebangs = true;
dontFixLibtool = true;

meta = {
description = "Generic library support script";
Expand Down
1 change: 1 addition & 0 deletions pkgs/development/tools/misc/libtool/libtool2.nix
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ stdenv.mkDerivation rec {
# Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
# "fixed" path in generated files!
dontPatchShebangs = true;
dontFixLibtool = true;

# XXX: The GNU ld wrapper does all sorts of nasty things wrt. RPATH, which
# leads to the failure of a number of tests.
Expand Down

0 comments on commit 4195ac3

Please sign in to comment.