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

octave: Fix libtool framework link failure on Darwin #96979

Merged
merged 1 commit into from Sep 7, 2020

Conversation

@graham33
Copy link
Contributor

@graham33 graham33 commented Sep 2, 2020

Motivation for this change

This fix moves linker flags of the form -framework foo from dependency_libs to
inherited_linker_flags, since libtool doesn't understand them. See #96977 for
details.

There may be a better way to do this, and it's also possible/likely that we could just drop these args from dependency_libs rather than moving them to inherited_linker_flags (which would simplify the implementation considerably). Using inherited_linker_flags was advised here: https://bugreports.qt.io/browse/QTBUG-48575.

Fixes #96977

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
@ttuegel
ttuegel approved these changes Sep 6, 2020
Copy link
Member

@ttuegel ttuegel left a comment

For some reason, the GitHub interface won't let me rebase your pull request. Please rebase this against the staging branch.

@graham33 graham33 force-pushed the graham33:fix/96977_octave_libtool branch from e51c2fa to f384abf Sep 6, 2020
@graham33 graham33 changed the base branch from master to staging Sep 6, 2020
This fix moves linker flags of the form `-framework foo` from dependency_libs to
inherited_linker_flags, since libtool doesn't understand them.  See #96977 for
details.

Fixes #96977
@graham33 graham33 force-pushed the graham33:fix/96977_octave_libtool branch from f384abf to 8e4e38c Sep 6, 2020
@graham33
Copy link
Contributor Author

@graham33 graham33 commented Sep 6, 2020

Rebased on staging.

@ttuegel ttuegel self-requested a review Sep 7, 2020
@ttuegel
ttuegel approved these changes Sep 7, 2020
@ttuegel ttuegel merged commit 6805511 into NixOS:staging Sep 7, 2020
19 checks passed
19 checks passed
tests tests
Details
action
Details
Evaluation Performance Report Evaluator Performance Report
Details
Wait for ofborg
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="8e4e38c"; rev="8e4e38cdcdc5f2be6875e6506d0789e9e5411ea6"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="8e4e38c"; rev="8e4e38cdcdc5f2be6875e6506d0789e9e5411ea6"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="8e4e38c"; rev="8e4e38cdcdc5f2be6875e6506d0789e9e5411ea6"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="8e4e38c"; rev="8e4e38cdcdc5f2be6875e6506d0789e9e5411ea6"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="8e4e38c"; rev="8e4e38cdcdc5f2be6875e6506d0789e9e5411ea6"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="8e4e38c"; rev="8e4e38cdcdc5f2be6875e6506d0789e9e5411ea6"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="8e4e38c"; rev="8e4e38cdcdc5f2be6875e6506d0789e9e5411ea6"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
octave, octave.passthru.tests on aarch64-linux Success
Details
octave, octave.passthru.tests on x86_64-linux Success
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

2 participants
You can’t perform that action at this time.