Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libtool: drop unused auto* dependencies #210118

Merged
merged 1 commit into from
Jan 14, 2023

Conversation

trofi
Copy link
Contributor

@trofi trofi commented Jan 10, 2023

Autoreconf was initially added in e44dd84 ("libtool2: macOS 11 support") for configure patches. The patches were removed since 2.4.7 release. Let's drop these dependencies to make boostrap tree leaner.

The diff of bootstrap tree before and after the change:

$ nix-store --query --graph $(nix-instantiate -A stdenv) |
    fgrep ' -> ' | awk '{print $3}' | sort -u |
    sed 's/"[0-9a-z]\{32\}-/"/g' | sort > before

$ nix-store --query --graph $(nix-instantiate -A stdenv) |
    fgrep ' -> ' | awk '{print $3}' | sort -u |
    sed 's/"[0-9a-z]\{32\}-/"/g' | sort > after

$ diff -U0 before after

--- before
+++ after
@@ -64,2 +63,0 @@
-"help2man-1.49.2.drv"
-"help2man-1.49.2.drv"
@@ -77 +74,0 @@
-"libxcrypt-4.4.33.drv"
@@ -88,4 +84,0 @@
-"perl-5.36.0.drv"
-"perl-5.36.0.drv"
-"perl5.36.0-gettext-1.07.drv"
-"perl5.36.0-gettext-1.07.drv"

This removes 2 of 3 builds of perl and help2man dependencies.

Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

pkgs/development/tools/misc/libtool/libtool2.nix Outdated Show resolved Hide resolved
@ghost ghost mentioned this pull request Jan 13, 2023
4 tasks
Autoreconf was initially added in e44dd84 ("libtool2: macOS 11
support") for configure patches. The patches were removed since 2.4.7
release. Let's drop these dependencies to make boostrap tree leaner.

The diff of bootstrap tree before and after the change:

    $ nix-store --query --graph $(nix-instantiate -A stdenv) |
        fgrep ' -> ' | awk '{print $3}' | sort -u |
        sed 's/"[0-9a-z]\{32\}-/"/g' | sort > before

    $ nix-store --query --graph $(nix-instantiate -A stdenv) |
        fgrep ' -> ' | awk '{print $3}' | sort -u |
        sed 's/"[0-9a-z]\{32\}-/"/g' | sort > after

    $ diff -U0 before after

    --- before
    +++ after
    @@ -64,2 +63,0 @@
    -"help2man-1.49.2.drv"
    -"help2man-1.49.2.drv"
    @@ -77 +74,0 @@
    -"libxcrypt-4.4.33.drv"
    @@ -88,4 +84,0 @@
    -"perl-5.36.0.drv"
    -"perl-5.36.0.drv"
    -"perl5.36.0-gettext-1.07.drv"
    -"perl5.36.0-gettext-1.07.drv"

This removes 2 of 3 builds of `perl` and `help2man` dependencies.

Co-authored-by: Adam Joseph <54836058+amjoseph-nixpkgs@users.noreply.github.com>
@trofi trofi force-pushed the libtool-without-perl branch from 596f56b to 6becbd3 Compare January 13, 2023 22:20
@Artturin Artturin merged commit 5e2d7ff into NixOS:staging Jan 14, 2023
@trofi trofi deleted the libtool-without-perl branch January 14, 2023 07:57
@Cynerd
Copy link
Contributor

Cynerd commented Jan 16, 2023

This seem to break build on aarch64 for me.

help2man: can't get `--help' info from libtoolize
Try `--no-discard-stderr' if option outputs to stderr
WARNING: 'help2man' is missing on your system.
         You should only need it if you modified a dependency of a man page.
         You may want to install the GNU Help2man package:
         <https://www.gnu.org/software/help2man/>

@amjoseph-nixpkgs is that something you are tackling as part of gcc11 for aarch64?

@Artturin
Copy link
Member

This seem to break build on aarch64 for me.

help2man: can't get `--help' info from libtoolize
Try `--no-discard-stderr' if option outputs to stderr
WARNING: 'help2man' is missing on your system.
         You should only need it if you modified a dependency of a man page.
         You may want to install the GNU Help2man package:
         <https://www.gnu.org/software/help2man/>

which build is that from? libtool builds for me on e09153d on aarch64-linux

@Cynerd
Copy link
Contributor

Cynerd commented Jan 16, 2023

The latest nixos-unstable-small (c85d086). I should add that it is not a native build but cross build.

@Artturin
Copy link
Member

this PR isn't even in master yet https://nixpk.gs/pr-tracker.html?pr=210118 so your issue is from some other commit

@Cynerd
Copy link
Contributor

Cynerd commented Jan 16, 2023

Oh.. sorry. You are right. The build process still includes help2man in my version. I jumped at this because I saw it being removed here. I have to investigate more than to know why it reports that it is not available in my case.

@trofi
Copy link
Contributor Author

trofi commented Jan 16, 2023

Do you apply local patches to libtool by chance? That could trigger manual rebuilds. If you want to do it locally you might need to pull in extra depends to rebuild docs (or ad a similar touch hack to avoid the extra depends).

@Cynerd
Copy link
Contributor

Cynerd commented Jan 17, 2023

Do you apply local patches to libtool by chance?

That would be my idea as well, but no. I am not applying any patches.

I tried to bisect the commit that might have broke it, but I ended up with a working build after bisect even on nixos-unstable-small. There is something smelly in libtool build.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants