picnoir/fix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
fix/src/libstore/local.mk

80 lines
2.1 KiB
Makefile
Raw Normal View History

Update Makefile variable names
2014-02-01 12:23:14 +01:00
libraries += libstore
New non-recursive, plain Make-based build system
2013-11-22 15:54:18 +01: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 00:53:41 +01:00
libstore_NAME = libnixstore
Rename $(here) to $(d) for brevity, and remove trailing slash
2013-11-22 17:45:52 +01:00
libstore_DIR := $(d)
New non-recursive, plain Make-based build system
2013-11-22 15:54:18 +01:00
Prepare for build/* files
2020-10-11 18:39:08 +02:00
libstore_SOURCES := $(wildcard $(d)/*.cc $(d)/builtins/*.cc $(d)/build/*.cc)
New non-recursive, plain Make-based build system
2013-11-22 15:54:18 +01: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 14:16:39 +02:00
libstore_LIBS = libutil
Allow (dynamic) libraries to depend on other libraries
2013-11-23 21:11:02 +01:00
Don't overwrite user provided `lib*_LDFLAGS` Signed-off-by: Pamplemousse <xav.maso@gmail.com>
2021-08-25 17:58:33 +02:00
libstore_LDFLAGS += $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(SODIUM_LIBS) -pthread
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 09:58:21 +02:00
ifdef HOST_LINUX
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 17:26:18 +01:00
libstore_LDFLAGS += -ldl
endif
Make the aws-cpp-sdk dependency optional
2016-05-04 17:16:48 +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 09:58:21 +02:00
ifdef HOST_DARWIN
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 01:15:51 +02:00
libstore_FILES = sandbox-defaults.sb sandbox-minimal.sb sandbox-network.sb
Only install *.sb files on macOS
2019-12-13 14:42:55 +01:00
endif
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 01:15:51 +02: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 17:16:48 +02:00
ifeq ($(ENABLE_S3), 1)
Support multi-part uploads for large NARs that exceed the size of 5Gb.
2018-05-07 15:23:51 +02:00
libstore_LDFLAGS += -laws-cpp-sdk-transfer -laws-cpp-sdk-s3 -laws-cpp-sdk-core
Make the aws-cpp-sdk dependency optional
2016-05-04 17:16:48 +02:00
endif
New non-recursive, plain Make-based build system
2013-11-22 15:54:18 +01: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 09:58:21 +02:00
ifdef HOST_SOLARIS
Fix compile errors on Illumos
2014-04-03 16:59:25 +02:00
libstore_LDFLAGS += -lsocket
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 08:35:01 +01:00
ifeq ($(HAVE_SECCOMP), 1)
Properly propagate libseccomp linker flags
2021-02-26 23:06:06 +01: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 11:34:24 +02:00
endif
Remove global -I flags
2020-03-30 14:29:29 +02:00
libstore_CXXFLAGS += \
Prepare for build/*.hh headers
2020-10-12 19:07:51 +02:00
-I src/libutil -I src/libstore -I src/libstore/build \
Fix using restricted mode with chroots
2015-04-16 18:46:17 +02:00
-DNIX_PREFIX=\"$(prefix)\" \
New non-recursive, plain Make-based build system
2013-11-22 15:54:18 +01:00
-DNIX_STORE_DIR=\"$(storedir)\" \
-DNIX_DATA_DIR=\"$(datadir)\" \
-DNIX_STATE_DIR=\"$(localstatedir)/nix\" \
-DNIX_LOG_DIR=\"$(localstatedir)/log/nix\" \
-DNIX_CONF_DIR=\"$(sysconfdir)/nix\" \
-DNIX_LIBEXEC_DIR=\"$(libexecdir)\" \
Add option ‘build-extra-chroot-dirs’ This is useful for extending (rather than overriding) the default set of chroot paths.
2014-08-04 18:00:00 +02:00
-DNIX_BIN_DIR=\"$(bindir)\" \
Set backup MANPATH in case man path isn’t set correctly. Previously, this would fail at startup for non-NixOS installs: nix-env --help The fix for this is to just use "nixManDir" as the value for MANPATH when spawning "man". To test this, I’m using the following: $ nix-build release.nix -A build $ MANPATH= ./result/bin/nix-env --help Fixes #1627
2018-02-14 23:05:55 +01:00
-DNIX_MAN_DIR=\"$(mandir)\" \
Detect lsof Also, don't use lsof on Linux since it's not needed. Fixes #1328.
2017-04-20 19:11:45 +02:00
-DLSOF=\"$(lsof)\"
Generate schema.sql.hh
2014-01-09 22:10:35 +01: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 18:21:37 +02:00
ifeq ($(embedded_sandbox_shell),yes)
libstore_CXXFLAGS += -DSANDBOX_SHELL=\"__embedded_sandbox_shell__\"
$(d)/build/local-derivation-goal.cc: $(d)/embedded-sandbox-shell.gen.hh
$(d)/embedded-sandbox-shell.gen.hh: $(sandbox_shell)
$(trace-gen) hexdump -v -e '1/1 "0x%x," "\n"' < $< > $@.tmp
@mv $@.tmp $@
else
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 05:12:31 +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 18:21:37 +02: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 05:12:31 +02:00
Rework the db schema for derivation outputs Add a new table for tracking the derivation output mappings. We used to hijack the `DerivationOutputs` table for that, but (despite its name), it isn't a really good fit: - Its entries depend on the drv being a valid path, making it play badly with garbage collection and preventing us to copy a drv output without copying the whole drv closure too; - It dosen't guaranty that the output path exists; By using a different table, we can experiment with a different schema better suited for tracking the output mappings of CA derivations. (incidentally, this also fixes #4138)
2020-10-20 15:14:02 +02:00
$(d)/local-store.cc: $(d)/schema.sql.gen.hh $(d)/ca-specific-schema.sql.gen.hh
Generate schema.sql.hh
2014-01-09 22:10:35 +01: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 01:15:51 +02:00
$(d)/build.cc:
Fix "make dist"
2014-02-01 14:28:31 +01:00
Darwin sandbox: Use sandbox-defaults.sb Issue #759. Also, remove nix.conf from the sandbox since I don't really see a legitimate reason for builders to access the Nix configuration.
2017-05-30 17:40:12 +02:00
%.gen.hh: %
OS X sandbox: Improve builtin sandbox profile Also, add rules to allow fixed-output derivations to access the network. These rules are sufficient to build stdenvDarwin without any __sandboxProfile magic.
2017-05-31 17:23:27 +02:00
@echo 'R"foo(' >> $@.tmp
$(trace-gen) cat $< >> $@.tmp
@echo ')foo"' >> $@.tmp
@mv $@.tmp $@
Darwin sandbox: Use sandbox-defaults.sb Issue #759. Also, remove nix.conf from the sandbox since I don't really see a legitimate reason for builders to access the Nix configuration.
2017-05-30 17:40:12 +02:00
Rework the db schema for derivation outputs Add a new table for tracking the derivation output mappings. We used to hijack the `DerivationOutputs` table for that, but (despite its name), it isn't a really good fit: - Its entries depend on the drv being a valid path, making it play badly with garbage collection and preventing us to copy a drv output without copying the whole drv closure too; - It dosen't guaranty that the output path exists; By using a different table, we can experiment with a different schema better suited for tracking the output mappings of CA derivations. (incidentally, this also fixes #4138)
2020-10-20 15:14:02 +02:00
clean-files += $(d)/schema.sql.gen.hh $(d)/ca-specific-schema.sql.gen.hh
Install some pkgconfig files
2014-09-18 12:00:40 +02:00
Install pkg-config files in the correct location Use `$(libdir)` while installing .pc files looks like a more generic solution. For example, it will work for distributions like RHEL or Fedora where .pc files are installed in `/usr/lib64/pkgconfig`.
2021-08-13 23:07:31 +02:00
$(eval $(call install-file-in, $(d)/nix-store.pc, $(libdir)/pkgconfig, 0644))
Install headers in the correct location
2020-02-03 18:04:09 +01: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 19:07:51 +02: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