Skip to content

Comments

sbcl: pull darwin fix pending upstream inclusion for -fno-common tool…#179934

Merged
7c6f434c merged 1 commit intoNixOS:masterfrom
trofi:fix-fno-common-for-sbcl
Jul 3, 2022
Merged

sbcl: pull darwin fix pending upstream inclusion for -fno-common tool…#179934
7c6f434c merged 1 commit intoNixOS:masterfrom
trofi:fix-fno-common-for-sbcl

Conversation

@trofi
Copy link
Contributor

@trofi trofi commented Jul 2, 2022 •
edited
Loading

…chains

Without the change build fails on darwin as:

duplicate symbol '_static_code_space_free_pointer' in:
    alloc.o
    traceroot.o
duplicate symbol '_static_code_space_free_pointer' in:
    alloc.o
    gencgc.o
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/)
  • 22.11 Release Notes (or backporting 22.05 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.

@trofi
sbcl: pull darwin fix pending upstream inclusion for -fno-common tool…
7be0e09 
…chains

Without the change build fails on darwin as:

    duplicate symbol '_static_code_space_free_pointer' in:
        alloc.o
        traceroot.o
    duplicate symbol '_static_code_space_free_pointer' in:
        alloc.o
        gencgc.o
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Jul 2, 2022
@trofi trofi mentioned this pull request Jul 2, 2022
Merged
13 tasks
@ofborg ofborg bot requested a review from 7c6f434c July 2, 2022 18:05
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels Jul 2, 2022
@7c6f434c 7c6f434c merged commit b759bf9 into NixOS:master Jul 3, 2022
@7c6f434c
Copy link
Member

7c6f434c commented Jul 3, 2022

Hmm, what's the highest supported version? #179949

@trofi
Copy link
Contributor Author

trofi commented Jul 3, 2022

I expect all of sbcls to need it until patch is merged upstream. If it gets merged sooner maybe 2.2.7 will contain it?

@trofi trofi deleted the fix-fno-common-for-sbcl branch July 3, 2022 07:23
@vcunat
Copy link
Member

vcunat commented Jul 19, 2022 •
edited
Loading

I still see four sbcl versions regressing with thes errors: https://hydra.nixos.org/eval/1771983?filter=sbcl&compare=1772009#tabs-now-fail

EDIT: though that's aarch64-darwin and you probably meant x86_64-darwin.

@trofi
Copy link
Contributor Author

trofi commented Jul 20, 2022

Oh, looks like there are 2 issues:

2.1.9, needs the same fix:

duplicate symbol '_static_code_space_free_pointer' in:

Initially I skipped it for patch application conflict, assumed unaffected.

duplicate symbol '_os_vm_page_size' in:

Something newer.

I'll try to deal with it today. Worst case we can sprinkle a few more NIX_CFLAGS_COMPILE = "-fcommon" for older versions. Looks like sbcl_2_2 builds fine.

@trofi
Copy link
Contributor Author

trofi commented Jul 21, 2022

Proposed possible fix as: #182377

It covers _os_vm_page_size with a backport where feasible and uses -fcommon for conflicting patch for older version.

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

Reviewers

@7c6f434c 7c6f434c Awaiting requested review from 7c6f434c

Assignees

No one assigned

Labels

6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@trofi @7c6f434c @vcunat