mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(3p/nix): Fix Meson configuration for libexpr

Browse source
This commit is contained in:
Vincent Ambo 2020-05-17 16:27:46 +01:00
parent c94ef8d00b
commit 65a1aae98c
1 changed files with 3 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
third_party/nix/src/libexpr/meson.build vendored
View file

@ -1,12 +1,3 @@
# Nix lib expr build file
#============================================================================
# src files
#============================================================================
src_inc += include_directories('.', 'primops') src_inc += include_directories('.', 'primops')
libexpr_src = files( libexpr_src = files(
@ -19,13 +10,15 @@ libexpr_src = files(
join_paths(meson.source_root(), 'src/libexpr/attr-set.cc'), join_paths(meson.source_root(), 'src/libexpr/attr-set.cc'),
join_paths(meson.source_root(), 'src/libexpr/common-eval-args.cc'), join_paths(meson.source_root(), 'src/libexpr/common-eval-args.cc'),
join_paths(meson.source_root(), 'src/libexpr/eval.cc'), join_paths(meson.source_root(), 'src/libexpr/eval.cc'),
join_paths(meson.source_root(), 'src/libexpr/function-trace.cc'),
join_paths(meson.source_root(), 'src/libexpr/get-drvs.cc'), join_paths(meson.source_root(), 'src/libexpr/get-drvs.cc'),
join_paths(meson.source_root(), 'src/libexpr/json-to-value.cc'), join_paths(meson.source_root(), 'src/libexpr/json-to-value.cc'),
join_paths(meson.source_root(), 'src/libexpr/names.cc'), join_paths(meson.source_root(), 'src/libexpr/names.cc'),
join_paths(meson.source_root(), 'src/libexpr/nixexpr.cc'), join_paths(meson.source_root(), 'src/libexpr/nixexpr.cc'),
join_paths(meson.source_root(), 'src/libexpr/primops.cc'), join_paths(meson.source_root(), 'src/libexpr/primops.cc'),
join_paths(meson.source_root(), 'src/libexpr/value-to-json.cc'), join_paths(meson.source_root(), 'src/libexpr/value-to-json.cc'),
join_paths(meson.source_root(), 'src/libexpr/value-to-xml.cc')) join_paths(meson.source_root(), 'src/libexpr/value-to-xml.cc'),
)
libexpr_headers = files( libexpr_headers = files(
join_paths(meson.source_root(), 'src/libexpr/attr-path.hh'), join_paths(meson.source_root(), 'src/libexpr/attr-path.hh'),
@ -44,12 +37,6 @@ libexpr_headers = files(
join_paths(meson.source_root(), 'src/libexpr/value-to-json.hh'), join_paths(meson.source_root(), 'src/libexpr/value-to-json.hh'),
join_paths(meson.source_root(), 'src/libexpr/value-to-xml.hh')) join_paths(meson.source_root(), 'src/libexpr/value-to-xml.hh'))
# dependancies
#============================================================================
libexpr_dep_list = [ libexpr_dep_list = [
libdl_dep, libdl_dep,
libsodium_dep] libsodium_dep]
@ -58,12 +45,6 @@ if sys_name == 'freebsd'
libexpr_dep_list += libdl_dep libexpr_dep_list += libdl_dep
endif endif
# Link args
#============================================================================
libexpr_link_list = [ libexpr_link_list = [
libutil_lib, libutil_lib,
libstore_lib, libstore_lib,
@ -71,20 +52,8 @@ libexpr_link_list = [
libexpr_link_args = [] libexpr_link_args = []
# compiler args
#============================================================================
libexpr_cxx_args = [] libexpr_cxx_args = []
# targets
#============================================================================
libexpr_src += custom_target( libexpr_src += custom_target(
'parser_tab.[cchh]', 'parser_tab.[cchh]',
output : [ output : [
@ -108,12 +77,6 @@ libexpr_src += custom_target(
'--header-file=@OUTPUT1@', '--header-file=@OUTPUT1@',
'@INPUT@']) '@INPUT@'])
# build
#============================================================================
libexpr_lib = library( libexpr_lib = library(
'nixexpr', 'nixexpr',
install : true, install : true,