max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-16 03:06:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
nix-super/src/libstore/local.mk

105 lines
2.9 KiB
Makefile
Raw Normal View History

Update Makefile variable names
2014-02-01 13:23:14 +02:00
libraries += libstore
New non-recursive, plain Make-based build system
2013-11-22 16:54:18 +02:00
Use libnix as a prefix for all Nix libraries In particular "libutil" was always a problem because it collides with Glibc's libutil. Even if we install into $(libdir)/nix, the linker sometimes got confused (e.g. if a program links against libstore but not libutil, then ld would report undefined symbols in libstore because it was looking at Glibc's libutil).
2013-11-24 01:53:41 +02:00
libstore_NAME = libnixstore
Rename $(here) to $(d) for brevity, and remove trailing slash
2013-11-22 18:45:52 +02:00
libstore_DIR := $(d)
New non-recursive, plain Make-based build system
2013-11-22 16:54:18 +02:00
Start building the scheduler for Windows Building derivations is a lot harder, but the downloading goals is portable enough. The "common channel" code is due to Volth. I wonder if there is a way we can factor it out into separate functions / files to avoid some within-function CPP. Co-authored-by: volth <volth@volth.com>
2024-05-10 20:03:05 +03:00
libstore_SOURCES := $(wildcard $(d)/*.cc $(d)/builtins/*.cc $(d)/build/*.cc)
Add unix (and linux) dirs In the Nix commit, platform-specific sources will go here.
2024-03-27 18:01:07 +02:00
ifdef HOST_UNIX
Misc Windows fixes 1. Fix build by making the legacy SSH Storey's secret `logFD` setting not a setting on Windows. (It doesn't make sense to specify `void *` handles by integer cross-proccess, I don't think.) 2. Move some files that don't need to be Unix-only anymore back to their original locations.
2024-06-01 23:39:59 +03:00
libstore_SOURCES += $(wildcard $(d)/unix/*.cc $(d)/unix/build/*.cc)
Build a minimized Nix with MinGW At this point many features are stripped out, but this works: - Can run libnix{util,store,expr} unit tests - Can run some Nix commands Co-Authored-By volth <volth@volth.com> Co-Authored-By Brian McKenna <brian@brianmckenna.org>
2023-09-03 00:35:16 +03:00
endif
Make a few commands that were Unix-only no longer Also clean up some more linux-specific (`setPersonality`) code in alignment with recent best practices.
2024-04-17 23:20:56 +03:00
ifdef HOST_LINUX
libstore_SOURCES += $(wildcard $(d)/linux/*.cc)
endif
Build a minimized Nix with MinGW At this point many features are stripped out, but this works: - Can run libnix{util,store,expr} unit tests - Can run some Nix commands Co-Authored-By volth <volth@volth.com> Co-Authored-By Brian McKenna <brian@brianmckenna.org>
2023-09-03 00:35:16 +03:00
ifdef HOST_WINDOWS
libstore_SOURCES += $(wildcard $(d)/windows/*.cc)
Add unix (and linux) dirs In the Nix commit, platform-specific sources will go here.
2024-03-27 18:01:07 +02:00
endif
New non-recursive, plain Make-based build system
2013-11-22 16:54:18 +02:00
StorePath: Rewrite in C++ On nix-env -qa -f '<nixpkgs>', this reduces maximum RSS by 20970 KiB and runtime by 0.8%. This is mostly because we're not parsing the hash part as a hash anymore (just validating that it consists of base-32 characters). Also, replace storePathToHash() by StorePath::hashPart().
2020-06-16 15:16:39 +03:00
libstore_LIBS = libutil
Allow (dynamic) libraries to depend on other libraries
2013-11-23 22:11:02 +02:00
Only link with `-pthread` on Unix We don't want this with MinGW.
2024-01-09 19:29:37 +02:00
libstore_LDFLAGS += $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(THREAD_LDFLAGS)
Apply OS checks to host platform, not build Previously, the build system used uname(1) output when it wanted to check the operating system it was being built for, which meant that it didn't take into-account cross-compilation when the build and host operating systems were different. To fix this, instead of consulting uname output, we consult the host triple, specifically the third "kernel" part. For "kernel"s with stable ABIs, like Linux or Cygwin, we can use a simple ifeq to test whether we're compiling for that system, but for other platforms, like Darwin, FreeBSD, or Solaris, we have to use a more complicated check to take into account the version numbers at the end of the "kernel"s. I couldn't find a way to just strip these version numbers in GNU Make without shelling out, which would be even more ugly IMO. Because these checks differ between kernels, and the patsubst ones are quite fiddly, I've added variables for each host OS we might want to check to make them easier to reuse.
2021-06-01 10:58:21 +03:00
ifdef HOST_LINUX
Allow for ergnomically putting Unix-only files in subdirs by creating `INLCUDE_$(pkg)` vars Separate platform-specific files will allow avoiding a lot of CPP.
2023-09-03 00:10:28 +03:00
libstore_LDFLAGS += -ldl
Add plugins to make Nix more extensible. All plugins in plugin-files will be dlopened, allowing them to statically construct instances of the various Register* types Nix supports.
2018-02-08 18:26:18 +02:00
endif
Enable the `unix://` store on Windows Windows now has some basic Unix Domain Socket support, see https://devblogs.microsoft.com/commandline/af_unix-comes-to-windows/ Building `nix daemon` on Windows I've left for later, because the daemon currently forks per connection but this is not an option on Windows. But we can get the client part working right away.
2024-04-18 23:49:52 +03:00
ifdef HOST_WINDOWS
libstore_LDFLAGS += -lws2_32
endif
Make the aws-cpp-sdk dependency optional
2016-05-04 18:16:48 +03:00
Shift Darwin sandbox to separate installed files This makes it slightly more manageable to see at a glance what in a build's sandbox profile is unique to the build and what is standard. Also a first step to factoring more of our Darwin logic into scheme functions that will allow us a bit more flexibility. And of course less of that nasty codegen in C++! 😀
2017-10-18 02:15:51 +03:00
$(foreach file,$(libstore_FILES),$(eval $(call install-data-in,$(d)/$(file),$(datadir)/nix/sandbox)))
Make the aws-cpp-sdk dependency optional
2016-05-04 18:16:48 +03:00
ifeq ($(ENABLE_S3), 1)
Make indentation in makesfiles consistent Tab (as required) for rules, two spaces for `if`...`endif`.
2024-01-11 03:26:02 +02:00
libstore_LDFLAGS += -laws-cpp-sdk-transfer -laws-cpp-sdk-s3 -laws-cpp-sdk-core -laws-crt-cpp
Make the aws-cpp-sdk dependency optional
2016-05-04 18:16:48 +03:00
endif
New non-recursive, plain Make-based build system
2013-11-22 16:54:18 +02:00
Apply OS checks to host platform, not build Previously, the build system used uname(1) output when it wanted to check the operating system it was being built for, which meant that it didn't take into-account cross-compilation when the build and host operating systems were different. To fix this, instead of consulting uname output, we consult the host triple, specifically the third "kernel" part. For "kernel"s with stable ABIs, like Linux or Cygwin, we can use a simple ifeq to test whether we're compiling for that system, but for other platforms, like Darwin, FreeBSD, or Solaris, we have to use a more complicated check to take into account the version numbers at the end of the "kernel"s. I couldn't find a way to just strip these version numbers in GNU Make without shelling out, which would be even more ugly IMO. Because these checks differ between kernels, and the patsubst ones are quite fiddly, I've added variables for each host OS we might want to check to make them easier to reuse.
2021-06-01 10:58:21 +03:00
ifdef HOST_SOLARIS
Make indentation in makesfiles consistent Tab (as required) for rules, two spaces for `if`...`endif`.
2024-01-11 03:26:02 +02:00
libstore_LDFLAGS += -lsocket
Fix compile errors on Illumos
2014-04-03 17:59:25 +03:00
endif
configure: Add a flag to disable seccomp. This is needed for new arches where libseccomp support doesn't exist yet. Fixes #1878.
2018-02-18 09:35:01 +02:00
ifeq ($(HAVE_SECCOMP), 1)
Make indentation in makesfiles consistent Tab (as required) for rules, two spaces for `if`...`endif`.
2024-01-11 03:26:02 +02:00
libstore_LDFLAGS += $(LIBSECCOMP_LIBS)
Add a seccomp filter to prevent creating setuid/setgid binaries This prevents builders from setting the S_ISUID or S_ISGID bits, preventing users from using a nixbld* user to create a setuid/setgid binary to interfere with subsequent builds under the same nixbld* uid. This is based on aszlig's seccomp code (47f587700d646f5b03a42f2fa57c28875a31efbe). Reported by Linus Heckemann.
2017-05-29 12:34:24 +03:00
endif
Allow for ergnomically putting Unix-only files in subdirs by creating `INLCUDE_$(pkg)` vars Separate platform-specific files will allow avoiding a lot of CPP.
2023-09-03 00:10:28 +03:00
# Not just for this library itself, but also for downstream libraries using this library
INCLUDE_libstore := -I $(d) -I $(d)/build
Add unix (and linux) dirs In the Nix commit, platform-specific sources will go here.
2024-03-27 18:01:07 +02:00
ifdef HOST_UNIX
Start building the scheduler for Windows Building derivations is a lot harder, but the downloading goals is portable enough. The "common channel" code is due to Volth. I wonder if there is a way we can factor it out into separate functions / files to avoid some within-function CPP. Co-authored-by: volth <volth@volth.com>
2024-05-10 20:03:05 +03:00
INCLUDE_libstore += -I $(d)/unix -I $(d)/unix/build
Add unix (and linux) dirs In the Nix commit, platform-specific sources will go here.
2024-03-27 18:01:07 +02:00
endif
Make a few commands that were Unix-only no longer Also clean up some more linux-specific (`setPersonality`) code in alignment with recent best practices.
2024-04-17 23:20:56 +03:00
ifdef HOST_LINUX
INCLUDE_libstore += -I $(d)/linux
endif
Create no-op Window pathlocks implementation This keeps the call sites simple, eventually this should be filled in.
2024-04-17 18:34:09 +03:00
ifdef HOST_WINDOWS
INCLUDE_libstore += -I $(d)/windows
endif
Allow for ergnomically putting Unix-only files in subdirs by creating `INLCUDE_$(pkg)` vars Separate platform-specific files will allow avoiding a lot of CPP.
2023-09-03 00:10:28 +03:00
Prefix `-DNIX_` paths to be windows-complient for windows This is a hacky solution, but it will do for now.
2024-01-13 22:47:08 +02:00
ifdef HOST_WINDOWS
NIX_ROOT = N:\\\\
else
NIX_ROOT =
endif
# Prefix all but `NIX_STORE_DIR`, since we aren't doing a local store
# yet so a "logical" store dir that is the same as unix is prefered.
#
# Also, it keeps the unit tests working.
Remove global -I flags
2020-03-30 15:29:29 +03:00
libstore_CXXFLAGS += \
Allow for ergnomically putting Unix-only files in subdirs by creating `INLCUDE_$(pkg)` vars Separate platform-specific files will allow avoiding a lot of CPP.
2023-09-03 00:10:28 +03:00
$(INCLUDE_libutil) $(INCLUDE_libstore) $(INCLUDE_libstore) \
Prefix `-DNIX_` paths to be windows-complient for windows This is a hacky solution, but it will do for now.
2024-01-13 22:47:08 +02:00
-DNIX_PREFIX=\"$(NIX_ROOT)$(prefix)\" \
New non-recursive, plain Make-based build system
2013-11-22 16:54:18 +02:00
-DNIX_STORE_DIR=\"$(storedir)\" \
Prefix `-DNIX_` paths to be windows-complient for windows This is a hacky solution, but it will do for now.
2024-01-13 22:47:08 +02:00
-DNIX_DATA_DIR=\"$(NIX_ROOT)$(datadir)\" \
-DNIX_STATE_DIR=\"$(NIX_ROOT)$(localstatedir)/nix\" \
-DNIX_LOG_DIR=\"$(NIX_ROOT)$(localstatedir)/log/nix\" \
-DNIX_CONF_DIR=\"$(NIX_ROOT)$(sysconfdir)/nix\" \
-DNIX_BIN_DIR=\"$(NIX_ROOT)$(bindir)\" \
-DNIX_MAN_DIR=\"$(NIX_ROOT)$(mandir)\" \
-DLSOF=\"$(NIX_ROOT)$(lsof)\"
Generate schema.sql.hh
2014-01-09 23:10:35 +02:00
Embed the sandbox shell into the statically linked 'nix' binary With this, Nix will write a copy of the sandbox shell to /bin/sh in the sandbox rather than bind-mounting it from the host filesystem. This makes /bin/sh work out of the box with nix-static, i.e. you no longer get /nix/store/qa36xhc5gpf42l3z1a8m1lysi40l9p7s-bootstrap-stage4-stdenv-linux/setup: ./configure: /bin/sh: bad interpreter: No such file or directory
2022-06-22 19:21:37 +03:00
ifeq ($(embedded_sandbox_shell),yes)
libstore_CXXFLAGS += -DSANDBOX_SHELL=\"__embedded_sandbox_shell__\"
Build a minimized Nix with MinGW At this point many features are stripped out, but this works: - Can run libnix{util,store,expr} unit tests - Can run some Nix commands Co-Authored-By volth <volth@volth.com> Co-Authored-By Brian McKenna <brian@brianmckenna.org>
2023-09-03 00:35:16 +03:00
$(d)/unix/build/local-derivation-goal.cc: $(d)/unix/embedded-sandbox-shell.gen.hh
Embed the sandbox shell into the statically linked 'nix' binary With this, Nix will write a copy of the sandbox shell to /bin/sh in the sandbox rather than bind-mounting it from the host filesystem. This makes /bin/sh work out of the box with nix-static, i.e. you no longer get /nix/store/qa36xhc5gpf42l3z1a8m1lysi40l9p7s-bootstrap-stage4-stdenv-linux/setup: ./configure: /bin/sh: bad interpreter: No such file or directory
2022-06-22 19:21:37 +03:00
Build a minimized Nix with MinGW At this point many features are stripped out, but this works: - Can run libnix{util,store,expr} unit tests - Can run some Nix commands Co-Authored-By volth <volth@volth.com> Co-Authored-By Brian McKenna <brian@brianmckenna.org>
2023-09-03 00:35:16 +03:00
$(d)/unix/embedded-sandbox-shell.gen.hh: $(sandbox_shell)
Embed the sandbox shell into the statically linked 'nix' binary With this, Nix will write a copy of the sandbox shell to /bin/sh in the sandbox rather than bind-mounting it from the host filesystem. This makes /bin/sh work out of the box with nix-static, i.e. you no longer get /nix/store/qa36xhc5gpf42l3z1a8m1lysi40l9p7s-bootstrap-stage4-stdenv-linux/setup: ./configure: /bin/sh: bad interpreter: No such file or directory
2022-06-22 19:21:37 +03:00
$(trace-gen) hexdump -v -e '1/1 "0x%x," "\n"' < $< > $@.tmp
@mv $@.tmp $@
else
Make indentation in makesfiles consistent Tab (as required) for rules, two spaces for `if`...`endif`.
2024-01-11 03:26:02 +02:00
ifneq ($(sandbox_shell),)
libstore_CXXFLAGS += -DSANDBOX_SHELL="\"$(sandbox_shell)\""
endif
Embed the sandbox shell into the statically linked 'nix' binary With this, Nix will write a copy of the sandbox shell to /bin/sh in the sandbox rather than bind-mounting it from the host filesystem. This makes /bin/sh work out of the box with nix-static, i.e. you no longer get /nix/store/qa36xhc5gpf42l3z1a8m1lysi40l9p7s-bootstrap-stage4-stdenv-linux/setup: ./configure: /bin/sh: bad interpreter: No such file or directory
2022-06-22 19:21:37 +03:00
endif
Handle empty sandbox_shell Previously, SANDBOX_SHELL was set to empty when unavailable. This caused issues when actually generating the sandbox. Instead, just set SANDBOX_SHELL when --with-sandbox-shell= is non-empty. Alternative implementation to https://github.com/NixOS/nix/pull/3038.
2019-10-09 06:12:31 +03:00
Build the local store on Windows Fixes #10558 Co-Authored-By: Eugene Butler <eugene@eugene4.com> Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
2024-04-19 00:49:17 +03:00
$(d)/local-store.cc: $(d)/schema.sql.gen.hh $(d)/ca-specific-schema.sql.gen.hh
Generate schema.sql.hh
2014-01-09 23:10:35 +02:00
Build a minimized Nix with MinGW At this point many features are stripped out, but this works: - Can run libnix{util,store,expr} unit tests - Can run some Nix commands Co-Authored-By volth <volth@volth.com> Co-Authored-By Brian McKenna <brian@brianmckenna.org>
2023-09-03 00:35:16 +03:00
$(d)/unix/build.cc:
Fix "make dist"
2014-02-01 15:28:31 +02:00
Build the local store on Windows Fixes #10558 Co-Authored-By: Eugene Butler <eugene@eugene4.com> Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
2024-04-19 00:49:17 +03:00
clean-files += $(d)/schema.sql.gen.hh $(d)/ca-specific-schema.sql.gen.hh
Install some pkgconfig files
2014-09-18 13:00:40 +03:00
Use `buildprefix` in a few more places `installcheck` doesn't yet work, but the rest of the build can now happen mostly inside a separate build directory. Progress on #9342 Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-11-25 07:33:21 +02:00
$(eval $(call install-file-in, $(buildprefix)$(d)/nix-store.pc, $(libdir)/pkgconfig, 0644))
Install headers in the correct location
2020-02-03 19:04:09 +02:00
$(foreach i, $(wildcard src/libstore/builtins/*.hh), \
$(eval $(call install-file-in, $(i), $(includedir)/nix/builtins, 0644)))
Prepare for build/*.hh headers
2020-10-12 20:07:51 +03:00
$(foreach i, $(wildcard src/libstore/build/*.hh), \
$(eval $(call install-file-in, $(i), $(includedir)/nix/build, 0644)))
Reference in a new issue Copy permalink