maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(3p/nix): added meson support

Browse source 
(cherry picked from commit 086a81b7a5bbe1fc022efb5935ff68f6ad71ddaf)
This commit is contained in:
p01arst0rm 2019-10-21 17:57:38 +01:00 • committed by Vincent Ambo
parent c455f7a987
commit 055139ac6a
27 changed files with 2045 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

106
third_party/nix/src/libutil/meson.build vendored Normal file
View file

@ -0,0 +1,106 @@
# Nix lib store build file
#============================================================================
# src files
#============================================================================
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/logging.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/logging.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/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')
)
# dependancies
#============================================================================
libutil_dep_list = [
boost_dep,
libbz2_dep,
liblzma_dep,
libbrotli_dep,
openssl_dep,
pthread_dep,
libsodium_dep]
# Link args
#============================================================================
libutil_link_list = []
libutil_link_args = []
# compiler args
#============================================================================
libutil_cxx_args = []
# targets
#============================================================================
# build
#============================================================================
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,
dependencies : libutil_dep_list)
install_headers(
libutil_headers,
install_dir : join_paths(includedir, 'nix'))

4
third_party/nix/src/libutil/util.cc vendored
View file

@ -33,7 +33,7 @@
#endif
extern char * * environ;
extern char * * environ __attribute__((weak));
namespace nix {
@ -1179,7 +1179,7 @@ void _interrupted()
/* Block user interrupts while an exception is being handled.
Throwing an exception while another exception is being handled
kills the program! */
if (!interruptThrown && !std::uncaught_exception()) {
if (!interruptThrown && !std::uncaught_exceptions()) {
interruptThrown = true;
throw Interrupted("interrupted by the user");
}