Skip to content

Commit 1a69fc6

Browse files
authored
Merge pull request #14001 from juhp/common-soversion
meson: refactor nix_soversion into nix-meson-build-support/common
2 parents 5e17a3f + 86bb7c9 commit 1a69fc6

File tree

17 files changed

+19
-16
lines changed

17 files changed

+19
-16
lines changed

nix-meson-build-support/common/meson.build

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,6 @@ if cxx.get_id() == 'clang' and ('address' in get_option('b_sanitize') or 'undefi
4040
))
4141
add_project_link_arguments('-shared-libasan', language : 'cpp')
4242
endif
43+
44+
# Darwin ld doesn't like "X.Y.Zpre"
45+
nix_soversion = meson.project_version().strip('pre')

src/libcmd/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ this_library = library(
9595
'nixcmd',
9696
sources,
9797
config_priv_h,
98-
soversion : meson.project_version().replace('pre', ''),
98+
soversion : nix_soversion,
9999
dependencies : deps_public + deps_private + deps_other,
100100
include_directories : include_dirs,
101101
link_args : linker_export_flags,

src/libexpr-c/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ subdir('nix-meson-build-support/windows-version')
5050
this_library = library(
5151
'nixexprc',
5252
sources,
53-
soversion : meson.project_version().replace('pre', ''),
53+
soversion : nix_soversion,
5454
dependencies : deps_public + deps_private + deps_other,
5555
include_directories : include_dirs,
5656
link_args : linker_export_flags,

src/libexpr-test-support/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ subdir('nix-meson-build-support/windows-version')
4444
this_library = library(
4545
'nix-expr-test-support',
4646
sources,
47-
soversion : meson.project_version().replace('pre', ''),
47+
soversion : nix_soversion,
4848
dependencies : deps_public + deps_private + deps_other,
4949
include_directories : include_dirs,
5050
# TODO: Remove `-lrapidcheck` when https://github.com/emil-e/rapidcheck/pull/326

src/libexpr/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ this_library = library(
181181
parser_tab,
182182
lexer_tab,
183183
generated_headers,
184-
soversion : meson.project_version().replace('pre', ''),
184+
soversion : nix_soversion,
185185
dependencies : deps_public + deps_private + deps_other,
186186
include_directories : include_dirs,
187187
link_args : linker_export_flags,

src/libfetchers-c/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ subdir('nix-meson-build-support/windows-version')
5353
this_library = library(
5454
'nixfetchersc',
5555
sources,
56-
soversion : meson.project_version().replace('pre', ''),
56+
soversion : nix_soversion,
5757
dependencies : deps_public + deps_private + deps_other,
5858
include_directories : include_dirs,
5959
link_args : linker_export_flags,

src/libfetchers/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ subdir('nix-meson-build-support/windows-version')
6161
this_library = library(
6262
'nixfetchers',
6363
sources,
64-
soversion : meson.project_version().replace('pre', ''),
64+
soversion : nix_soversion,
6565
dependencies : deps_public + deps_private + deps_other,
6666
include_directories : include_dirs,
6767
link_args : linker_export_flags,

src/libflake-c/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ subdir('nix-meson-build-support/windows-version')
5353
this_library = library(
5454
'nixflakec',
5555
sources,
56-
soversion : meson.project_version().replace('pre', ''),
56+
soversion : nix_soversion,
5757
dependencies : deps_public + deps_private + deps_other,
5858
include_directories : include_dirs,
5959
link_args : linker_export_flags,

src/libflake/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ this_library = library(
5858
'nixflake',
5959
sources,
6060
generated_headers,
61-
soversion : meson.project_version().replace('pre', ''),
61+
soversion : nix_soversion,
6262
dependencies : deps_public + deps_private + deps_other,
6363
include_directories : include_dirs,
6464
link_args : linker_export_flags,

src/libmain-c/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ subdir('nix-meson-build-support/windows-version')
4545
this_library = library(
4646
'nixmainc',
4747
sources,
48-
soversion : meson.project_version().replace('pre', ''),
48+
soversion : nix_soversion,
4949
dependencies : deps_public + deps_private + deps_other,
5050
include_directories : include_dirs,
5151
link_args : linker_export_flags,

0 commit comments

Comments
 (0)