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.

Sign up for GitHub

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

Jump to bottom

Fix cross manual #11820

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix cross manual #11820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
60df5bc
refact: Extract build-utils-meson/libatomic
roberth Nov 6, 2024
ec4204c
fix: Build nix-store on arm with libatomic
roberth Nov 6, 2024
7f467ce
fix: Add splicing to fix the manual in cross
roberth Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions build-utils-meson/libatomic/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@

# Check if -latomic is needed
# This is needed for std::atomic on some platforms
# We did not manage to test this reliably on all platforms, so we hardcode
# it for now.
if host_machine.cpu_family() == 'arm'
deps_other += cxx.find_library('atomic')
endif
35 changes: 26 additions & 9 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,18 +124,35 @@
# without "polluting" the top level "`pkgs`" attrset.
# This also has the benefit of providing us with a distinct set of packages
# we can iterate over.
nixComponents = lib.makeScope final.nixDependencies.newScope (import ./packaging/components.nix {
inherit (final) lib;
inherit officialRelease;
src = self;
});
nixComponents =
lib.makeScopeWithSplicing'
{
inherit (final) splicePackages;
inherit (final.nixDependencies) newScope;
}
{
otherSplices = final.generateSplicesForMkScope "nixComponents";
f = import ./packaging/components.nix {
inherit (final) lib;
inherit officialRelease;
src = self;
};
};

# The dependencies are in their own scope, so that they don't have to be
# in Nixpkgs top level `pkgs` or `nixComponents`.
nixDependencies = lib.makeScope final.newScope (import ./packaging/dependencies.nix {
inherit inputs stdenv;
pkgs = final;
});
nixDependencies = lib.makeScopeWithSplicing'
{
inherit (final) splicePackages;
inherit (final) newScope;
}
{
otherSplices = final.generateSplicesForMkScope "nixDependencies";
f = import ./packaging/dependencies.nix {
inherit inputs stdenv;
pkgs = final;
};
};

nix = final.nixComponents.nix;

Expand Down
1 change: 1 addition & 0 deletions src/libstore/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ if host_machine.system() == 'windows'
deps_other += [wsock32]
endif

subdir('build-utils-meson/libatomic')
subdir('build-utils-meson/threads')

boost = dependency(
Expand Down
9 changes: 1 addition & 8 deletions src/libutil/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,9 @@ endforeach

configdata.set('HAVE_DECL_AT_SYMLINK_NOFOLLOW', cxx.has_header_symbol('fcntl.h', 'AT_SYMLINK_NOFOLLOW').to_int())

subdir('build-utils-meson/libatomic')
subdir('build-utils-meson/threads')

# Check if -latomic is needed
# This is needed for std::atomic on some platforms
# We did not manage to test this reliably on all platforms, so we hardcode
# it for now.
if host_machine.cpu_family() == 'arm'
deps_other += cxx.find_library('atomic')
endif

if host_machine.system() == 'windows'
socket = cxx.find_library('ws2_32')
deps_other += socket
Expand Down
Loading