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

gettext: don't add -lintl on musl, either #37688

Merged
merged 1 commit into from Mar 23, 2018

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Mar 23, 2018

gettext won't actually provide libintl unless we go out of
our way to tell it to do so [1][2].

We could add those flags on musl (as I initially did in [3]),
but then we have two different libintl.h files and generally
some confusion about which gettext is being used.

Instead of sorting that out, for now let's just continue on
without gettext providing libintl-- it's worked well enough so far.

Only change that needs to be made, then, is to avoid
adding -lintl on musl since there is no libintl.

[1] pullmoll/void-packages@c739240
[2] https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/libintl/libintl-0.19.8.1.ebuild?id=332e48712b6521697f992f923c9c985482dd1c36#n41
[3] dtzWill@729302f

  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Sorry for not catching this earlier during review!

This unbreaks musl builds, and should be "safe" in that it preserves
prior behavior (rather than wrangling with the problem just yet).

gettext won't actually provide libintl unless we go out of
our way to tell it to do so [1][2].

We could add those flags on musl (as I initially did in [3]),
but then we have two different libintl.h files and generally
some confusion about which gettext is being used.

Instead of sorting that out, for now let's just continue on
without gettext providing libintl-- it's worked well enough so far.

Only change that needs to be made, then, is to avoid
adding -lintl on musl since there is no libintl.

[1] pullmoll/void-packages@c739240
[2] https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/libintl/libintl-0.19.8.1.ebuild?id=332e48712b6521697f992f923c9c985482dd1c36#n41
[3] 729302f
@dtzWill
Copy link
Member Author

dtzWill commented Mar 23, 2018

@dtzWill
Copy link
Member Author

dtzWill commented Mar 23, 2018

cc #37012

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: gettext

Partial log (click to expand)

cannot build derivation '/nix/store/syx8advkw863jzj0110brcmh3d7xfdid-ICU-osx-10.10.5.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/7kgfq8zb202gq19pr09w9i1py54cq3qa-cctools-binutils-darwin.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/5k3zrz5354i24vx7wbri25c8mg8m5fis-gnutar-1.30.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/4icj1dwpf1lrb5hf35x3b13h8nj2rwiv-CF-osx-10.10.5.drv': 7 dependencies couldn't be built
cannot build derivation '/nix/store/gvrni8qkr5v5k9hrrk8wliifd29vihyy-cctools-binutils-darwin-wrapper.drv': 7 dependencies couldn't be built
cannot build derivation '/nix/store/y8d8mjkphiwc8r94w74wsy3y0c1zckr0-clang-wrapper-5.0.1.drv': 9 dependencies couldn't be built
cannot build derivation '/nix/store/rxyg34jgdk0kk2dh43zlgn9ikz9k0svs-stdenv-darwin.drv': 35 dependencies couldn't be built
cannot build derivation '/nix/store/gm7cgjc3bgc74lc45rrnbz7df2ahkcib-libiconv-osx-10.11.6.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/3kacb294b8lk7rgwkdvk2qbbsw83kjqs-gettext-0.19.8.drv': 4 dependencies couldn't be built
�[31;1merror:�[0m build of '/nix/store/3kacb294b8lk7rgwkdvk2qbbsw83kjqs-gettext-0.19.8.drv' failed

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Attempted: gettext

Partial log (click to expand)

cannot build derivation '/nix/store/d8sm970qhvc7bccpskassxljhc8mjv6l-lzip-1.20.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/b0i9v7h77af3jsh8bc0l7ldy4xkmmqxj-binutils-wrapper-2.30.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/zxh38bfsq6jyprwqk3zn8ff62zsjfdxg-diffutils-3.6.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/6v02nc32h21wx7233dl3cllyb8dnlxxc-ed-1.14.2.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/axvn9sznzc41c9d4f8awrkr8jzsy0d0m-findutils-4.6.0.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/3d2ky6wgv4w1bdv5jh9jazgpbyxlx438-gcc-wrapper-7.3.0.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/cdkn3dsl4zbxsrjihwfas6g9cjk24811-patch-2.7.6.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/mi12cpd5mszcfrkhrv14c29a4rz16iki-stdenv-linux.drv': 23 dependencies couldn't be built
cannot build derivation '/nix/store/ncndrrm6bdpb5b5d59b47qpp1zpj1qk0-gettext-0.19.8.drv': 3 dependencies couldn't be built
error: build of '/nix/store/ncndrrm6bdpb5b5d59b47qpp1zpj1qk0-gettext-0.19.8.drv' failed

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: gettext

Partial log (click to expand)

/nix/store/a36b038fpfw79ddwrlnbgb3lxhq6mgnj-gettext-0.19.8-doc/share/doc/gettext/examples/hello-c-gnome/autoclean.sh: interpreter directive changed from "/bin/sh" to "/nix/store/raky49nkpdkqyxd02s7qv5wbffnhk1ml-bash-4.4-p19/bin/sh"
/nix/store/a36b038fpfw79ddwrlnbgb3lxhq6mgnj-gettext-0.19.8-doc/share/doc/gettext/examples/hello-c-gnome/autogen.sh: interpreter directive changed from "/bin/sh" to "/nix/store/raky49nkpdkqyxd02s7qv5wbffnhk1ml-bash-4.4-p19/bin/sh"
/nix/store/a36b038fpfw79ddwrlnbgb3lxhq6mgnj-gettext-0.19.8-doc/share/doc/gettext/examples/hello-c/autoclean.sh: interpreter directive changed from "/bin/sh" to "/nix/store/raky49nkpdkqyxd02s7qv5wbffnhk1ml-bash-4.4-p19/bin/sh"
/nix/store/a36b038fpfw79ddwrlnbgb3lxhq6mgnj-gettext-0.19.8-doc/share/doc/gettext/examples/hello-c/autogen.sh: interpreter directive changed from "/bin/sh" to "/nix/store/raky49nkpdkqyxd02s7qv5wbffnhk1ml-bash-4.4-p19/bin/sh"
checking for references to /build in /nix/store/a36b038fpfw79ddwrlnbgb3lxhq6mgnj-gettext-0.19.8-doc...
shrinking RPATHs of ELF executables and libraries in /nix/store/dxyf8qkkgp9q4fbcxm3gazz4555i982v-gettext-0.19.8-info
strip is /nix/store/ry8fzbr5myz674sif6804xvw7555m7jd-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/dxyf8qkkgp9q4fbcxm3gazz4555i982v-gettext-0.19.8-info
checking for references to /build in /nix/store/dxyf8qkkgp9q4fbcxm3gazz4555i982v-gettext-0.19.8-info...
/nix/store/z3h1kww8s3mfdkdsfkh2xi04dwldyjjh-gettext-0.19.8

@Ericson2314
Copy link
Member

Ericson2314 commented Mar 23, 2018

Sounds good for now.

Do you think if we get started on #37056 there will be an opportunity to bring in musl/alpine people on stuff like this?

@dtzWill
Copy link
Member Author

dtzWill commented Mar 23, 2018

@GrahamcOfBorg build gettext

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: gettext

Partial log (click to expand)

/nix/store/z3h1kww8s3mfdkdsfkh2xi04dwldyjjh-gettext-0.19.8

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: gettext

Partial log (click to expand)

/nix/store/v51891rk9l6l4ba68ckap1xldqsy109z-gettext-0.19.8

@dtzWill
Copy link
Member Author

dtzWill commented Mar 23, 2018

There we go :).

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: gettext

Partial log (click to expand)

cannot build derivation '/nix/store/syx8advkw863jzj0110brcmh3d7xfdid-ICU-osx-10.10.5.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/7kgfq8zb202gq19pr09w9i1py54cq3qa-cctools-binutils-darwin.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/5k3zrz5354i24vx7wbri25c8mg8m5fis-gnutar-1.30.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/4icj1dwpf1lrb5hf35x3b13h8nj2rwiv-CF-osx-10.10.5.drv': 7 dependencies couldn't be built
cannot build derivation '/nix/store/gvrni8qkr5v5k9hrrk8wliifd29vihyy-cctools-binutils-darwin-wrapper.drv': 7 dependencies couldn't be built
cannot build derivation '/nix/store/y8d8mjkphiwc8r94w74wsy3y0c1zckr0-clang-wrapper-5.0.1.drv': 9 dependencies couldn't be built
cannot build derivation '/nix/store/rxyg34jgdk0kk2dh43zlgn9ikz9k0svs-stdenv-darwin.drv': 35 dependencies couldn't be built
cannot build derivation '/nix/store/gm7cgjc3bgc74lc45rrnbz7df2ahkcib-libiconv-osx-10.11.6.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/3kacb294b8lk7rgwkdvk2qbbsw83kjqs-gettext-0.19.8.drv': 4 dependencies couldn't be built
�[31;1merror:�[0m build of '/nix/store/3kacb294b8lk7rgwkdvk2qbbsw83kjqs-gettext-0.19.8.drv' failed

@dtzWill dtzWill merged commit 4ae1790 into NixOS:staging Mar 23, 2018
@dtzWill dtzWill deleted the fix/no-libintl-musl branch March 23, 2018 16:26
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.

None yet

3 participants