Skip to content

dante: disable getaddrinfo() checks if cross#224929

Merged
2 commits merged intomasterfrom
unknown repository
Apr 24, 2023
Merged

dante: disable getaddrinfo() checks if cross#224929
2 commits merged intomasterfrom
unknown repository

Conversation

@ghost
Copy link
Copy Markdown

@ghost ghost commented Apr 6, 2023

Description of changes

This PR contains three changes to dante which would merge-conflict with each other if submitted separately.

The first commit fixes breakage resulting from a recent upgrade to autoconf:

  • dante: include gnugrep and gawk in nativeBuildInputs if autoreconfHook-ing

The second commit runs autoreconfHook unconditionally, rather than only on one platform, so we notice problems more quickly:

  • dante: autoreconfHook unconditionally

The third change expands the set of conditions under which we bypass dante's configure-time getaddrinfo() check to include not only mips native builds, but also all cross builds. The bypass is required in both cases:

  • dante: disable getaddrinfo() checks if cross

@ghost ghost added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Apr 6, 2023
@ghost
Copy link
Copy Markdown
Author

ghost commented Apr 6, 2023

@ofborg build pkgsCross.mips64el-linux-gnuabi64.dante
@ofborg build pkgsCross.aarch64-multiplatform.dante

@ghost
Copy link
Copy Markdown
Author

ghost commented Apr 6, 2023

@ofborg ofborg bot requested a review from Shados April 6, 2023 04:12
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Apr 6, 2023
@ghost ghost requested a review from Artturin April 7, 2023 06:12
Prior to this commit, dante's configure-time getaddrinfo() checks
were disabled only if stdenv.hostPlatform.isMips64.

These checks must also be disabled if the buildPlatform cannot
execute hostPlatform binaries.  This commit factors out the control
of this disablement as a flag and adds an additional situation in
which that flag is enabled.
@ghost ghost merged commit f8f7bfd into NixOS:master Apr 24, 2023
@ghost ghost deleted the pr/dante/cross branch April 24, 2023 01:21
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: cross-compilation Building packages on a different platform than they will be used on 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant