From 3d7537da7fbb37cb043eaa28acc7ffade9bec99d Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Wed, 27 May 2020 22:00:00 +0100 Subject: chore(3p/nix): Remove meson build files for core packages --- third_party/nix/src/libexpr/meson.build | 97 -------------------- third_party/nix/src/libmain/meson.build | 40 -------- third_party/nix/src/libstore/meson.build | 153 ------------------------------- third_party/nix/src/libutil/meson.build | 68 -------------- third_party/nix/src/meson.build | 47 ---------- 5 files changed, 405 deletions(-) delete mode 100644 third_party/nix/src/libexpr/meson.build delete mode 100644 third_party/nix/src/libmain/meson.build delete mode 100644 third_party/nix/src/libstore/meson.build delete mode 100644 third_party/nix/src/libutil/meson.build delete mode 100644 third_party/nix/src/meson.build (limited to 'third_party/nix/src') diff --git a/third_party/nix/src/libexpr/meson.build b/third_party/nix/src/libexpr/meson.build deleted file mode 100644 index ce50838b9744..000000000000 --- a/third_party/nix/src/libexpr/meson.build +++ /dev/null @@ -1,97 +0,0 @@ -src_inc += include_directories('.', 'primops') - -libexpr_src = files( - join_paths(meson.source_root(), 'src/libexpr/primops/context.cc'), - join_paths(meson.source_root(), 'src/libexpr/primops/fetchGit.cc'), - join_paths(meson.source_root(), 'src/libexpr/primops/fetchMercurial.cc'), - join_paths(meson.source_root(), 'src/libexpr/primops/fromTOML.cc'), - - join_paths(meson.source_root(), 'src/libexpr/attr-path.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/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/json-to-value.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/primops.cc'), - join_paths(meson.source_root(), 'src/libexpr/symbol-table.cc'), - join_paths(meson.source_root(), 'src/libexpr/value-to-json.cc'), - join_paths(meson.source_root(), 'src/libexpr/value-to-xml.cc'), -) - -libexpr_headers = files( - join_paths(meson.source_root(), 'src/libexpr/attr-path.hh'), - join_paths(meson.source_root(), 'src/libexpr/attr-set.hh'), - join_paths(meson.source_root(), 'src/libexpr/common-eval-args.hh'), - join_paths(meson.source_root(), 'src/libexpr/eval.hh'), - join_paths(meson.source_root(), 'src/libexpr/eval-inline.hh'), - join_paths(meson.source_root(), 'src/libexpr/function-trace.hh'), - join_paths(meson.source_root(), 'src/libexpr/get-drvs.hh'), - join_paths(meson.source_root(), 'src/libexpr/json-to-value.hh'), - join_paths(meson.source_root(), 'src/libexpr/names.hh'), - join_paths(meson.source_root(), 'src/libexpr/nixexpr.hh'), - join_paths(meson.source_root(), 'src/libexpr/primops.hh'), - join_paths(meson.source_root(), 'src/libexpr/symbol-table.hh'), - join_paths(meson.source_root(), 'src/libexpr/value.hh'), - join_paths(meson.source_root(), 'src/libexpr/value-to-json.hh'), - join_paths(meson.source_root(), 'src/libexpr/value-to-xml.hh')) - -libexpr_dep_list = [ - gc_dep, - glog_dep, - libdl_dep, - libsodium_dep, -] + absl_deps - -libexpr_link_list = [ - libutil_lib, - libstore_lib, - libmain_lib, -] - -libexpr_link_args = [ - '-lpthread', - '-lgccpp', -] - -libexpr_cxx_args = [] - -libexpr_src += custom_target( - 'parser_tab.[cchh]', - output : [ - 'parser-tab.cc', - 'parser-tab.hh'], - input : 'parser.y', - command : [ - bison, - '-v', - '--output=@OUTPUT0@', - '@INPUT@', - '-d']) - -libexpr_src += custom_target( - 'lexer_tab.[cchh]', - output : ['lexer-tab.cc', 'lexer-tab.hh'], - input : 'lexer.l', - command : [ - flex, - '--outfile=@OUTPUT0@', - '--header-file=@OUTPUT1@', - '@INPUT@']) - -libexpr_lib = library( - 'nixexpr', - install : true, - install_mode : 'rwxr-xr-x', - install_dir : libdir, - include_directories : src_inc, - link_with : libexpr_link_list, - sources : libexpr_src, - link_args : libexpr_link_args, - dependencies : libexpr_dep_list) - -install_headers( - libexpr_headers, - install_dir : join_paths(includedir, 'nix')) diff --git a/third_party/nix/src/libmain/meson.build b/third_party/nix/src/libmain/meson.build deleted file mode 100644 index 052430105957..000000000000 --- a/third_party/nix/src/libmain/meson.build +++ /dev/null @@ -1,40 +0,0 @@ -src_inc += include_directories('.') - -libmain_src = files( - join_paths(meson.source_root(), 'src/libmain/common-args.cc'), - join_paths(meson.source_root(), 'src/libmain/shared.cc'), - join_paths(meson.source_root(), 'src/libmain/stack.cc')) - -libmain_headers = files( - join_paths(meson.source_root(), 'src/libmain/common-args.hh'), - join_paths(meson.source_root(), 'src/libmain/shared.hh')) - -libmain_dep_list = [ - glog_dep, - pthread_dep, - openssl_dep, - libsodium_dep, -] - -libmain_link_list = [ - libutil_lib, - libstore_lib, -] - -libmain_link_args = [] -libstore_cxx_args = [] - -libmain_lib = library( - 'nixmain', - install : true, - install_mode : 'rwxr-xr-x', - install_dir : libdir, - include_directories : src_inc, - link_with : libmain_link_list, - sources : libmain_src, - link_args : libmain_link_args, - dependencies : libmain_dep_list) - -install_headers( - libmain_headers, - install_dir : join_paths(includedir, 'nix')) diff --git a/third_party/nix/src/libstore/meson.build b/third_party/nix/src/libstore/meson.build deleted file mode 100644 index b8564f24f8b0..000000000000 --- a/third_party/nix/src/libstore/meson.build +++ /dev/null @@ -1,153 +0,0 @@ -# Nix lib store build file -#============================================================================ - -src_inc += include_directories('.') - -libstore_src = files( - join_paths(meson.source_root(), 'src/libstore/binary-cache-store.cc'), - join_paths(meson.source_root(), 'src/libstore/build.cc'), - join_paths(meson.source_root(), 'src/libstore/crypto.cc'), - join_paths(meson.source_root(), 'src/libstore/derivations.cc'), - join_paths(meson.source_root(), 'src/libstore/download.cc'), - join_paths(meson.source_root(), 'src/libstore/export-import.cc'), - join_paths(meson.source_root(), 'src/libstore/gc.cc'), - join_paths(meson.source_root(), 'src/libstore/globals.cc'), - join_paths(meson.source_root(), 'src/libstore/http-binary-cache-store.cc'), - join_paths(meson.source_root(), 'src/libstore/legacy-ssh-store.cc'), - join_paths(meson.source_root(), 'src/libstore/local-binary-cache-store.cc'), - join_paths(meson.source_root(), 'src/libstore/local-fs-store.cc'), - join_paths(meson.source_root(), 'src/libstore/local-store.cc'), - join_paths(meson.source_root(), 'src/libstore/machines.cc'), - join_paths(meson.source_root(), 'src/libstore/misc.cc'), - join_paths(meson.source_root(), 'src/libstore/nar-accessor.cc'), - join_paths(meson.source_root(), 'src/libstore/nar-info.cc'), - join_paths(meson.source_root(), 'src/libstore/nar-info-disk-cache.cc'), - join_paths(meson.source_root(), 'src/libstore/optimise-store.cc'), - join_paths(meson.source_root(), 'src/libstore/parsed-derivations.cc'), - join_paths(meson.source_root(), 'src/libstore/pathlocks.cc'), - join_paths(meson.source_root(), 'src/libstore/profiles.cc'), - join_paths(meson.source_root(), 'src/libstore/references.cc'), - join_paths(meson.source_root(), 'src/libstore/remote-fs-accessor.cc'), - join_paths(meson.source_root(), 'src/libstore/remote-store.cc'), - join_paths(meson.source_root(), 'src/libstore/s3-binary-cache-store.cc'), - join_paths(meson.source_root(), 'src/libstore/sqlite.cc'), - join_paths(meson.source_root(), 'src/libstore/ssh.cc'), - join_paths(meson.source_root(), 'src/libstore/ssh-store.cc'), - join_paths(meson.source_root(), 'src/libstore/store-api.cc'), - join_paths(meson.source_root(), 'src/libstore/builtins/buildenv.cc'), - join_paths(meson.source_root(), 'src/libstore/builtins/fetchurl.cc')) - -libstore_headers = files( - join_paths(meson.source_root(), 'src/libstore/binary-cache-store.hh'), - join_paths(meson.source_root(), 'src/libstore/builtins.hh'), - join_paths(meson.source_root(), 'src/libstore/crypto.hh'), - join_paths(meson.source_root(), 'src/libstore/derivations.hh'), - join_paths(meson.source_root(), 'src/libstore/download.hh'), - join_paths(meson.source_root(), 'src/libstore/fs-accessor.hh'), - join_paths(meson.source_root(), 'src/libstore/globals.hh'), - join_paths(meson.source_root(), 'src/libstore/local-store.hh'), - join_paths(meson.source_root(), 'src/libstore/machines.hh'), - join_paths(meson.source_root(), 'src/libstore/nar-accessor.hh'), - join_paths(meson.source_root(), 'src/libstore/nar-info-disk-cache.hh'), - join_paths(meson.source_root(), 'src/libstore/nar-info.hh'), - join_paths(meson.source_root(), 'src/libstore/parsed-derivations.hh'), - join_paths(meson.source_root(), 'src/libstore/pathlocks.hh'), - join_paths(meson.source_root(), 'src/libstore/profiles.hh'), - join_paths(meson.source_root(), 'src/libstore/references.hh'), - join_paths(meson.source_root(), 'src/libstore/remote-fs-accessor.hh'), - join_paths(meson.source_root(), 'src/libstore/remote-store.hh'), - join_paths(meson.source_root(), 'src/libstore/s3-binary-cache-store.hh'), - join_paths(meson.source_root(), 'src/libstore/s3.hh'), - join_paths(meson.source_root(), 'src/libstore/serve-protocol.hh'), - join_paths(meson.source_root(), 'src/libstore/sqlite.hh'), - join_paths(meson.source_root(), 'src/libstore/ssh.hh'), - join_paths(meson.source_root(), 'src/libstore/store-api.hh'), - join_paths(meson.source_root(), 'src/libstore/worker-protocol.hh')) - -libstore_data = files( - join_paths(meson.source_root(), 'src/libstore/sandbox-defaults.sb'), - join_paths(meson.source_root(), 'src/libstore/sandbox-minimal.sb'), - join_paths(meson.source_root(), 'src/libstore/sandbox-network.sb')) - -# dependancies -#============================================================================ - -libstore_dep_list = [ - glog_dep, - libbz2_dep, - libcurl_dep, - libdl_dep, - pthread_dep, - sqlite3_dep, - libsodium_dep -] + absl_deps - -if sys_name.contains('linux') - libstore_dep_list += libseccomp_dep -endif - -if sys_name.contains('freebsd') - libstore_dep_list += libdl_dep -endif - -# Link args -#============================================================================ - -libstore_link_list = [ - libutil_lib] - -libstore_link_args = [] - -# compiler args -#============================================================================ - -libstore_cxx_args = [ - '-DNIX_PREFIX="@0@" '.format(prefix), - '-DNIX_STORE_DIR="@0@" '.format(nixstoredir), - '-DNIX_DATA_DIR="@0@" '.format(datadir), - '-DNIX_STATE_DIR="@0@" '.format(join_paths(localstatedir, 'nix')), - '-DNIX_LOG_DIR="@0@" '.format(join_paths(localstatedir, 'log/nix')), - '-DNIX_CONF_DIR="@0@" '.format(join_paths(sysconfdir, 'nix')), - '-DNIX_LIBEXEC_DIR="@0@" '.format(libexecdir), - '-DNIX_BIN_DIR="@0@" '.format(bindir), - '-DNIX_MAN_DIR="@0@" '.format(mandir), - '-DSANDBOX_SHELL="@0@" '.format(get_option('sandbox_shell')), - '-DLSOF="@0@" '.format(lsof)] - -# targets -#============================================================================ - -gen_header = ''' - echo 'R"foo(' >> "$1" - cat @INPUT@ >> "$1" - echo ')foo"' >> "$1" -''' - -libstore_src += custom_target( - 'schema.sql.gen.hh', - output : 'schema.sql.gen.hh', - input : 'schema.sql', - command : [bash, '-c', gen_header, 'sh', '@OUTPUT@']) - -# build -#============================================================================ - -libstore_lib = library( - 'nixstore', - install : true, - install_mode : 'rwxr-xr-x', - install_dir : libdir, - include_directories : src_inc, - link_with : libstore_link_list, - sources : libstore_src, - cpp_args : libstore_cxx_args, - link_args : libstore_link_args, - dependencies : libstore_dep_list) - -install_headers( - libstore_headers, - install_dir : join_paths(includedir, 'nix')) - -install_data( - libstore_data, - install_dir : join_paths(datadir, 'nix/sandbox')) diff --git a/third_party/nix/src/libutil/meson.build b/third_party/nix/src/libutil/meson.build deleted file mode 100644 index 50043a8fad57..000000000000 --- a/third_party/nix/src/libutil/meson.build +++ /dev/null @@ -1,68 +0,0 @@ -src_inc += include_directories('.') - -libutil_src = files( - join_paths(meson.source_root(), 'src/libutil/affinity.cc'), - join_paths(meson.source_root(), 'src/libutil/archive.cc'), - join_paths(meson.source_root(), 'src/libutil/args.cc'), - join_paths(meson.source_root(), 'src/libutil/compression.cc'), - join_paths(meson.source_root(), 'src/libutil/config.cc'), - join_paths(meson.source_root(), 'src/libutil/hash.cc'), - join_paths(meson.source_root(), 'src/libutil/json.cc'), - join_paths(meson.source_root(), 'src/libutil/serialise.cc'), - join_paths(meson.source_root(), 'src/libutil/thread-pool.cc'), - join_paths(meson.source_root(), 'src/libutil/util.cc'), - join_paths(meson.source_root(), 'src/libutil/xml-writer.cc'), -) - -libutil_headers = files( - join_paths(meson.source_root(), 'src/libutil/affinity.hh'), - join_paths(meson.source_root(), 'src/libutil/archive.hh'), - join_paths(meson.source_root(), 'src/libutil/args.hh'), - join_paths(meson.source_root(), 'src/libutil/compression.hh'), - join_paths(meson.source_root(), 'src/libutil/config.hh'), - join_paths(meson.source_root(), 'src/libutil/finally.hh'), - join_paths(meson.source_root(), 'src/libutil/hash.hh'), - join_paths(meson.source_root(), 'src/libutil/istringstream_nocopy.hh'), - join_paths(meson.source_root(), 'src/libutil/json.hh'), - join_paths(meson.source_root(), 'src/libutil/lazy.hh'), - join_paths(meson.source_root(), 'src/libutil/lru-cache.hh'), - join_paths(meson.source_root(), 'src/libutil/monitor-fd.hh'), - join_paths(meson.source_root(), 'src/libutil/pool.hh'), - join_paths(meson.source_root(), 'src/libutil/prefork-compat.hh'), - join_paths(meson.source_root(), 'src/libutil/ref.hh'), - join_paths(meson.source_root(), 'src/libutil/serialise.hh'), - join_paths(meson.source_root(), 'src/libutil/sync.hh'), - join_paths(meson.source_root(), 'src/libutil/thread-pool.hh'), - join_paths(meson.source_root(), 'src/libutil/types.hh'), - join_paths(meson.source_root(), 'src/libutil/util.hh'), - join_paths(meson.source_root(), 'src/libutil/xml-writer.hh'), -) - -libutil_dep_list = [ - glog_dep, - boost_dep, - libbz2_dep, - liblzma_dep, - libbrotli_dep, - openssl_dep, - pthread_dep, - libsodium_dep, -] + absl_deps - -libutil_link_list = [] -libutil_link_args = [] - -libutil_lib = library( - 'nixutil', - install : true, - install_mode : 'rwxr-xr-x', - install_dir : libdir, - include_directories : src_inc, - sources : libutil_src, - link_args : libutil_link_args, - # cpp_args : [ '-E' ], - dependencies : libutil_dep_list) - -install_headers( - libutil_headers, - install_dir : join_paths(includedir, 'nix')) diff --git a/third_party/nix/src/meson.build b/third_party/nix/src/meson.build deleted file mode 100644 index 59916a944aed..000000000000 --- a/third_party/nix/src/meson.build +++ /dev/null @@ -1,47 +0,0 @@ -# nix src build file -#============================================================================ - -src_dirs = [ - 'libutil', - 'libstore', - 'libmain', - 'libexpr', - 'nix', -] - -foreach dir : src_dirs - subdir(dir) -endforeach - - - -libstore_config = pkg.generate( - libstore_lib, - libraries : [ - libutil_lib], - version : meson.project_version(), - name : 'Nix', - subdirs : ['nix/'], - filebase : 'nix-store', - extra_cflags : '-std=c++17', - description : 'Nix Package Manager.') - -libmain_config = pkg.generate( - libmain_lib, - version : meson.project_version(), - name : 'Nix', - subdirs : ['nix/'], - filebase : 'nix-main', - extra_cflags : '-std=c++17', - description : 'Nix Package Manager.') - -libexpr_config = pkg.generate( - libexpr_lib, - libraries : [ - libstore_lib], - version : meson.project_version(), - name : 'Nix', - subdirs : ['nix/'], - filebase : 'nix-expr', - extra_cflags : '-std=c++17', - description : 'Nix Package Manager.') -- cgit 1.4.1