mirror of
https://github.com/NixOS/nix.git
synced 2025-11-09 03:56:01 +01:00
remove 'pre' version suffix for non-releases (chokes Darwin ld)
This commit is contained in:
parent
2b0fd88324
commit
dd1a554aba
16 changed files with 16 additions and 0 deletions
|
|
@ -95,6 +95,7 @@ this_library = library(
|
||||||
'nixcmd',
|
'nixcmd',
|
||||||
sources,
|
sources,
|
||||||
config_priv_h,
|
config_priv_h,
|
||||||
|
soversion : meson.project_version().replace('pre', ''),
|
||||||
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,
|
||||||
|
|
|
||||||
|
|
@ -50,6 +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', ''),
|
||||||
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,
|
||||||
|
|
|
||||||
|
|
@ -44,6 +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', ''),
|
||||||
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
|
||||||
|
|
|
||||||
|
|
@ -181,6 +181,7 @@ this_library = library(
|
||||||
parser_tab,
|
parser_tab,
|
||||||
lexer_tab,
|
lexer_tab,
|
||||||
generated_headers,
|
generated_headers,
|
||||||
|
soversion : meson.project_version().replace('pre', ''),
|
||||||
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,
|
||||||
|
|
|
||||||
|
|
@ -53,6 +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', ''),
|
||||||
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,
|
||||||
|
|
|
||||||
|
|
@ -61,6 +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', ''),
|
||||||
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,
|
||||||
|
|
|
||||||
|
|
@ -53,6 +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', ''),
|
||||||
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,
|
||||||
|
|
|
||||||
|
|
@ -58,6 +58,7 @@ this_library = library(
|
||||||
'nixflake',
|
'nixflake',
|
||||||
sources,
|
sources,
|
||||||
generated_headers,
|
generated_headers,
|
||||||
|
soversion : meson.project_version().replace('pre', ''),
|
||||||
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,
|
||||||
|
|
|
||||||
|
|
@ -45,6 +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', ''),
|
||||||
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,
|
||||||
|
|
|
||||||
|
|
@ -77,6 +77,7 @@ this_library = library(
|
||||||
'nixmain',
|
'nixmain',
|
||||||
sources,
|
sources,
|
||||||
config_priv_h,
|
config_priv_h,
|
||||||
|
soversion : meson.project_version().replace('pre', ''),
|
||||||
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,
|
||||||
|
|
|
||||||
|
|
@ -46,6 +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', ''),
|
||||||
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,
|
||||||
|
|
|
||||||
|
|
@ -44,6 +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', ''),
|
||||||
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
|
||||||
|
|
|
||||||
|
|
@ -363,6 +363,7 @@ this_library = library(
|
||||||
generated_headers,
|
generated_headers,
|
||||||
sources,
|
sources,
|
||||||
config_priv_h,
|
config_priv_h,
|
||||||
|
soversion : meson.project_version().replace('pre', ''),
|
||||||
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,
|
||||||
|
|
|
||||||
|
|
@ -53,6 +53,7 @@ this_library = library(
|
||||||
'nixutilc',
|
'nixutilc',
|
||||||
sources,
|
sources,
|
||||||
config_priv_h,
|
config_priv_h,
|
||||||
|
soversion : meson.project_version().replace('pre', ''),
|
||||||
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,
|
||||||
|
|
|
||||||
|
|
@ -41,6 +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', ''),
|
||||||
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
|
||||||
|
|
|
||||||
|
|
@ -197,6 +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', ''),
|
||||||
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,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue