max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-22 22:16:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

More dedup

Browse source
This commit is contained in:
John Ericson 2024-06-27 12:57:32 -04:00
parent d6f57f3260
commit 8198888bc4
4 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
meson-utils/threads/meson.build Normal file
View file

@ -0,0 +1,6 @@
# This is only conditional to work around
# https://github.com/mesonbuild/meson/issues/13293. It should be
# unconditional.
if not (host_machine.system() == 'windows' and cxx.get_id() == 'gcc')
deps_private += dependency('threads')
endif

7
src/libexpr/meson.build
View file

@ -27,12 +27,7 @@ deps_public_maybe_subproject = [
] ]
subdir('meson-utils/subprojects') subdir('meson-utils/subprojects')
# This is only conditional to work around subdir('meson-utils/threads')
# https://github.com/mesonbuild/meson/issues/13293. It should be
# unconditional.
if not (host_machine.system() == 'windows' and cxx.get_id() == 'gcc')
deps_private += dependency('threads')
endif
boost = dependency( boost = dependency(
'boost', 'boost',

7
src/libstore/meson.build
View file

@ -67,12 +67,7 @@ has_acl_support = cxx.has_header('sys/xattr.h') \
and cxx.has_function('lremovexattr') and cxx.has_function('lremovexattr')
configdata.set('HAVE_ACL_SUPPORT', has_acl_support.to_int()) configdata.set('HAVE_ACL_SUPPORT', has_acl_support.to_int())
# This is only conditional to work around subdir('meson-utils/threads')
# https://github.com/mesonbuild/meson/issues/13293. It should be
# unconditional.
if not (host_machine.system() == 'windows' and cxx.get_id() == 'gcc')
deps_private += dependency('threads')
endif
boost = dependency( boost = dependency(
'boost', 'boost',

7
src/libutil/meson.build
View file

@ -48,12 +48,7 @@ foreach funcspec : check_funcs
configdata.set(define_name, define_value) configdata.set(define_name, define_value)
endforeach endforeach
# This is only conditional to work around subdir('meson-utils/threads')
# https://github.com/mesonbuild/meson/issues/13293. It should be
# unconditional.
if not (host_machine.system() == 'windows' and cxx.get_id() == 'gcc')
deps_private += dependency('threads')
endif
if host_machine.system() == 'windows' if host_machine.system() == 'windows'
socket = cxx.find_library('ws2_32') socket = cxx.find_library('ws2_32')