various: Enable updateAutotoolsGnuConfigScriptsHook#313496
Merged
Ericson2314 merged 1 commit intoNixOS:stagingfrom May 27, 2024
Merged
various: Enable updateAutotoolsGnuConfigScriptsHook#313496Ericson2314 merged 1 commit intoNixOS:stagingfrom
Ericson2314 merged 1 commit intoNixOS:stagingfrom
Conversation
rhelmot
force-pushed
the
freebsd-minimal3/gnu-config
branch
from
7c711d1 to
be747d6
Compare
ofborg
bot
added
10.rebuild-darwin-stdenv
rhelmot
force-pushed
the
freebsd-minimal3/gnu-config
branch
from
be747d6 to
a3f9af5
Compare
Contributor
Author
|
Added lndir and sharutils, which popped out when I did an attempt of merging all the remaining branches and building it |
rhelmot
force-pushed
the
freebsd-minimal3/gnu-config
branch
from
a3f9af5 to
fd470b0
Compare
alyssais
approved these changes
May 23, 2024
Ericson2314
reviewed
May 26, 2024
Member
Ericson2314
left a comment
Ericson2314
left a comment
There was a problem hiding this comment.
Looks good, but just want these comments outside the postPatch so we can reword without causing further mass rebuilds.
Perhaps the comments should also mention FreeBSD so people don't remove them by accident ("well, I didn't see any /usr/bin/uname` actually being used...").
rhelmot
force-pushed
the
freebsd-minimal3/gnu-config
branch
from
fe2f70c to
ed9cab9
Compare
Contributor
Author
|
Done! The vanilla flag in pkg-config determines whether to apply a very controversial patch which changes some semantics and is not wanted by the maintainers but is universally wanted by packagers. |
ofborg
bot
added
the
2.status: merge conflict
rhelmot
force-pushed
the
freebsd-minimal3/gnu-config
branch
2 times, most recently
from
db3c4eb to
40592ae
Compare
ofborg
bot
removed
the
2.status: merge conflict
Ericson2314
approved these changes
May 27, 2024
Member
Ericson2314
left a comment
Ericson2314
left a comment
There was a problem hiding this comment.
Ah unfortunately there are conflicts now, but yes this does look good now!
Ericson2314
force-pushed
the
freebsd-minimal3/gnu-config
branch
from
40592ae to
55ac5c4
Compare
Prior to August 2023, any config.guess generated by autoconf will include a hardcoded /usr/bin/uname invocation for FreeBSD on any architecture other than arm. This clearly doesn't work under nix. We must then update or otherwise patch each old config.guess.
Ericson2314
force-pushed
the
freebsd-minimal3/gnu-config
branch
from
55ac5c4 to
846de80
Compare
This was referenced May 29, 2024
14 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of changes
Part of #296581; As discussed in #311760
Prior to August 2023, any config.guess generated by autoconf will include a hardcoded /usr/bin/uname invocation for FreeBSD on any architecture other than arm. This clearly doesn't work under nix. We must then update or otherwise patch each old config.guess.
This patches just enough to get the FreeBSD native stdenv (forthcoming) to build.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.