nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-08 19:46:02 +01:00
Code Activity

meson: refactor nix_soversion into nix-meson-build-support/common

Browse source 
This is a follow-on to #13995 which added soversion to the libraries
This commit is contained in:
Jens Petersen 2025-09-16 12:54:30 +08:00
parent 5e17a3f81c
commit 86bb7c958a
17 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
nix-meson-build-support/common/meson.build
View file

@ -40,3 +40,6 @@ if cxx.get_id() == 'clang' and ('address' in get_option('b_sanitize') or 'undefi
)) ))
add_project_link_arguments('-shared-libasan', language : 'cpp') add_project_link_arguments('-shared-libasan', language : 'cpp')
endif endif
# Darwin ld doesn't like "X.Y.Zpre"
nix_soversion = meson.project_version().strip('pre')

2
src/libcmd/meson.build
View file

@ -95,7 +95,7 @@ this_library = library(
'nixcmd', 'nixcmd',
sources, sources,
config_priv_h, config_priv_h,
soversion : meson.project_version().replace('pre', ''), soversion : nix_soversion,
dependencies : deps_public + deps_private + deps_other, dependencies : deps_public + deps_private + deps_other,
include_directories : include_dirs, include_directories : include_dirs,
link_args : linker_export_flags, link_args : linker_export_flags,

2
src/libexpr-c/meson.build
View file

@ -50,7 +50,7 @@ subdir('nix-meson-build-support/windows-version')
this_library = library( this_library = library(
'nixexprc', 'nixexprc',
sources, sources,
soversion : meson.project_version().replace('pre', ''), soversion : nix_soversion,
dependencies : deps_public + deps_private + deps_other, dependencies : deps_public + deps_private + deps_other,
include_directories : include_dirs, include_directories : include_dirs,
link_args : linker_export_flags, link_args : linker_export_flags,

2
src/libexpr-test-support/meson.build
View file

@ -44,7 +44,7 @@ subdir('nix-meson-build-support/windows-version')
this_library = library( this_library = library(
'nix-expr-test-support', 'nix-expr-test-support',
sources, sources,
soversion : meson.project_version().replace('pre', ''), soversion : nix_soversion,
dependencies : deps_public + deps_private + deps_other, dependencies : deps_public + deps_private + deps_other,
include_directories : include_dirs, include_directories : include_dirs,
# TODO: Remove `-lrapidcheck` when https://github.com/emil-e/rapidcheck/pull/326 # TODO: Remove `-lrapidcheck` when https://github.com/emil-e/rapidcheck/pull/326

2
src/libexpr/meson.build
View file

@ -181,7 +181,7 @@ this_library = library(
parser_tab, parser_tab,
lexer_tab, lexer_tab,
generated_headers, generated_headers,
soversion : meson.project_version().replace('pre', ''), soversion : nix_soversion,
dependencies : deps_public + deps_private + deps_other, dependencies : deps_public + deps_private + deps_other,
include_directories : include_dirs, include_directories : include_dirs,
link_args : linker_export_flags, link_args : linker_export_flags,

2
src/libfetchers-c/meson.build
View file

@ -53,7 +53,7 @@ subdir('nix-meson-build-support/windows-version')
this_library = library( this_library = library(
'nixfetchersc', 'nixfetchersc',
sources, sources,
soversion : meson.project_version().replace('pre', ''), soversion : nix_soversion,
dependencies : deps_public + deps_private + deps_other, dependencies : deps_public + deps_private + deps_other,
include_directories : include_dirs, include_directories : include_dirs,
link_args : linker_export_flags, link_args : linker_export_flags,

2
src/libfetchers/meson.build
View file

@ -61,7 +61,7 @@ subdir('nix-meson-build-support/windows-version')
this_library = library( this_library = library(
'nixfetchers', 'nixfetchers',
sources, sources,
soversion : meson.project_version().replace('pre', ''), soversion : nix_soversion,
dependencies : deps_public + deps_private + deps_other, dependencies : deps_public + deps_private + deps_other,
include_directories : include_dirs, include_directories : include_dirs,
link_args : linker_export_flags, link_args : linker_export_flags,

2
src/libflake-c/meson.build
View file

@ -53,7 +53,7 @@ subdir('nix-meson-build-support/windows-version')
this_library = library( this_library = library(
'nixflakec', 'nixflakec',
sources, sources,
soversion : meson.project_version().replace('pre', ''), soversion : nix_soversion,
dependencies : deps_public + deps_private + deps_other, dependencies : deps_public + deps_private + deps_other,
include_directories : include_dirs, include_directories : include_dirs,
link_args : linker_export_flags, link_args : linker_export_flags,

2
src/libflake/meson.build
View file

@ -58,7 +58,7 @@ this_library = library(
'nixflake', 'nixflake',
sources, sources,
generated_headers, generated_headers,
soversion : meson.project_version().replace('pre', ''), soversion : nix_soversion,
dependencies : deps_public + deps_private + deps_other, dependencies : deps_public + deps_private + deps_other,
include_directories : include_dirs, include_directories : include_dirs,
link_args : linker_export_flags, link_args : linker_export_flags,

2
src/libmain-c/meson.build
View file

@ -45,7 +45,7 @@ subdir('nix-meson-build-support/windows-version')
this_library = library( this_library = library(
'nixmainc', 'nixmainc',
sources, sources,
soversion : meson.project_version().replace('pre', ''), soversion : nix_soversion,
dependencies : deps_public + deps_private + deps_other, dependencies : deps_public + deps_private + deps_other,
include_directories : include_dirs, include_directories : include_dirs,
link_args : linker_export_flags, link_args : linker_export_flags,

2
src/libmain/meson.build
View file

@ -77,7 +77,7 @@ this_library = library(
'nixmain', 'nixmain',
sources, sources,
config_priv_h, config_priv_h,
soversion : meson.project_version().replace('pre', ''), soversion : nix_soversion,
dependencies : deps_public + deps_private + deps_other, dependencies : deps_public + deps_private + deps_other,
include_directories : include_dirs, include_directories : include_dirs,
link_args : linker_export_flags, link_args : linker_export_flags,

2
src/libstore-c/meson.build
View file

@ -46,7 +46,7 @@ subdir('nix-meson-build-support/windows-version')
this_library = library( this_library = library(
'nixstorec', 'nixstorec',
sources, sources,
soversion : meson.project_version().replace('pre', ''), soversion : nix_soversion,
dependencies : deps_public + deps_private + deps_other, dependencies : deps_public + deps_private + deps_other,
include_directories : include_dirs, include_directories : include_dirs,
link_args : linker_export_flags, link_args : linker_export_flags,

2
src/libstore-test-support/meson.build
View file

@ -44,7 +44,7 @@ subdir('nix-meson-build-support/windows-version')
this_library = library( this_library = library(
'nix-store-test-support', 'nix-store-test-support',
sources, sources,
soversion : meson.project_version().replace('pre', ''), soversion : nix_soversion,
dependencies : deps_public + deps_private + deps_other, dependencies : deps_public + deps_private + deps_other,
include_directories : include_dirs, include_directories : include_dirs,
# TODO: Remove `-lrapidcheck` when https://github.com/emil-e/rapidcheck/pull/326 # TODO: Remove `-lrapidcheck` when https://github.com/emil-e/rapidcheck/pull/326

2
src/libstore/meson.build
View file

@ -363,7 +363,7 @@ this_library = library(
generated_headers, generated_headers,
sources, sources,
config_priv_h, config_priv_h,
soversion : meson.project_version().replace('pre', ''), soversion : nix_soversion,
dependencies : deps_public + deps_private + deps_other, dependencies : deps_public + deps_private + deps_other,
include_directories : include_dirs, include_directories : include_dirs,
link_args : linker_export_flags, link_args : linker_export_flags,

2
src/libutil-c/meson.build
View file

@ -53,7 +53,7 @@ this_library = library(
'nixutilc', 'nixutilc',
sources, sources,
config_priv_h, config_priv_h,
soversion : meson.project_version().replace('pre', ''), soversion : nix_soversion,
dependencies : deps_public + deps_private + deps_other, dependencies : deps_public + deps_private + deps_other,
include_directories : include_dirs, include_directories : include_dirs,
link_args : linker_export_flags, link_args : linker_export_flags,

2
src/libutil-test-support/meson.build
View file

@ -41,7 +41,7 @@ subdir('nix-meson-build-support/windows-version')
this_library = library( this_library = library(
'nix-util-test-support', 'nix-util-test-support',
sources, sources,
soversion : meson.project_version().replace('pre', ''), soversion : nix_soversion,
dependencies : deps_public + deps_private + deps_other, dependencies : deps_public + deps_private + deps_other,
include_directories : include_dirs, include_directories : include_dirs,
# TODO: Remove `-lrapidcheck` when https://github.com/emil-e/rapidcheck/pull/326 # TODO: Remove `-lrapidcheck` when https://github.com/emil-e/rapidcheck/pull/326

2
src/libutil/meson.build
View file

@ -197,7 +197,7 @@ subdir('nix-meson-build-support/windows-version')
this_library = library( this_library = library(
'nixutil', 'nixutil',
sources, sources,
soversion : meson.project_version().replace('pre', ''), soversion : nix_soversion,
dependencies : deps_public + deps_private + deps_other, dependencies : deps_public + deps_private + deps_other,
include_directories : include_dirs, include_directories : include_dirs,
link_args : linker_export_flags, link_args : linker_export_flags,