max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-24 14:56:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
nix-super/src/libexpr/local.mk

53 lines
1.7 KiB
Makefile
Raw Normal View History

Update Makefile variable names
2014-02-01 13:23:14 +02:00
libraries += libexpr
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
libexpr_NAME = libnixexpr
Rename $(here) to $(d) for brevity, and remove trailing slash
2013-11-22 18:45:52 +02:00
libexpr_DIR := $(d)
New non-recursive, plain Make-based build system
2013-11-22 16:54:18 +02:00
Move flake-related stuff to src/libexpr/flake
2019-06-05 17:51:54 +03:00
libexpr_SOURCES := \
$(wildcard $(d)/*.cc) \
Parse string context elements properly Prior to this change, we had a bunch of ad-hoc string manipulation code scattered around. This made it hard to figure out what data model for string contexts is. Now, we still store string contexts most of the time as encoded strings --- I was wary of the performance implications of changing that --- but whenever we parse them we do so only through the `NixStringContextElem::parse` method, which handles all cases. This creates a data type that is very similar to `DerivedPath` but: - Represents the funky `=<drvpath>` case as properly distinct from the others. - Only encodes a single output, no wildcards and no set, for the "built" case. (I would like to deprecate `=<path>`, after which we are in spitting distance of `DerivedPath` and could maybe get away with fewer types, but that is another topic for another day.)
2023-01-03 18:44:59 +02:00
$(wildcard $(d)/value/*.cc) \
Move flake-related stuff to src/libexpr/flake
2019-06-05 17:51:54 +03:00
$(wildcard $(d)/primops/*.cc) \
$(d)/lexer-tab.cc \
$(d)/parser-tab.cc
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
New non-recursive, plain Make-based build system
2013-11-22 16:54:18 +02:00
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_libexpr := -I $(d)
libexpr: Use GC_set_sp_corrector instead of patch Manually tested by printing to stderr in both branches (sp in os stack, or not), and triggering a GC in a filterSource function, e.g.: let generateTree = n: if n == 0 then "ha" else { left = generateTree (n - 1); right = generateTree (n - 1); }; in builtins.deepSeq (generateTree 18) ... Note that the darwin still uses the strategy of disabling GC, despite having an implementation that compiles. The proper solution will be enabled and tested later.
2024-02-27 20:42:41 +02:00
libexpr_CXXFLAGS += \
$(INCLUDE_libutil) $(INCLUDE_libstore) $(INCLUDE_libfetchers) $(INCLUDE_libmain) $(INCLUDE_libexpr) \
-DGC_THREADS
Remove global -I flags
2020-03-30 15:29:29 +03: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
libexpr_LIBS = libutil libstore libfetchers
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
libexpr_LDFLAGS += -lboost_context $(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
Make indentation in makesfiles consistent Tab (as required) for rules, two spaces for `if`...`endif`.
2024-01-11 03:26:02 +02:00
libexpr_LDFLAGS += -ldl
Don't try to link libdl on FreeBSD. There is no libdl on FreeBSD. Instead the symbols are included in libc.
2015-10-02 16:35:33 +03:00
endif
Add importNative primop This can be used to import a dynamic shared object and return an arbitrary value, including new primops. This can be used both to test new primops without having to recompile nix every time, and to build specialized primops that probably don't belong upstream (e.g. a function that calls out to gpg to decrypt a nixops secret as-needed). The imported function should initialize the Value & as needed. A single import can define multiple values by creating an attrset or list, of course. An example initialization function might look like: extern "C" void initialize(nix::EvalState & state, nix::Value & v) { v.type = nix::tPrimOp; v.primOp = NEW nix::PrimOp(myFun, 1, state.symbols.create("myFun")); } Then `builtins.importNative ./example.so "initialize"` will evaluate to the primop defined in the myFun function.
2014-06-01 17:42:56 +03:00
Drop the dependency on libgc in libmain Instead, libexpr now depends on libgc. This means commands like nix-store that don't do any evaluation no longer require libgc.
2013-11-23 22:19:36 +02:00
# The dependency on libgc must be propagated (i.e. meaning that
# programs/libraries that use libexpr must explicitly pass -lgc),
# because inline functions in libexpr's header files call libgc.
libexpr_LDFLAGS_PROPAGATED = $(BDW_GC_LIBS)
Fix dependency ordering
2014-09-04 21:02:08 +03:00
libexpr_ORDER_AFTER := $(d)/parser-tab.cc $(d)/parser-tab.hh $(d)/lexer-tab.cc $(d)/lexer-tab.hh
Revert "Fix parser/lexer generation with parallel make" This reverts commit d277442df53a01343ba7c1df0bbd2a294058dcba. Make sucks.
2018-08-23 01:23:35 +03:00
$(d)/parser-tab.cc $(d)/parser-tab.hh: $(d)/parser.y
Fix "make dist"
2014-02-01 15:28:31 +02:00
$(trace-gen) bison -v -o $(libexpr_DIR)/parser-tab.cc $< -d
Generate the parser and the lexer
2013-11-22 17:22:31 +02:00
Revert "Fix parser/lexer generation with parallel make" This reverts commit d277442df53a01343ba7c1df0bbd2a294058dcba. Make sucks.
2018-08-23 01:23:35 +03:00
$(d)/lexer-tab.cc $(d)/lexer-tab.hh: $(d)/lexer.l
Fix "make dist"
2014-02-01 15:28:31 +02:00
$(trace-gen) flex --outfile $(libexpr_DIR)/lexer-tab.cc --header-file=$(libexpr_DIR)/lexer-tab.hh $<
clean-files += $(d)/parser-tab.cc $(d)/parser-tab.hh $(d)/lexer-tab.cc $(d)/lexer-tab.hh
More "make dist" fixes
2014-02-01 16:18:48 +02: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-expr.pc, $(libdir)/pkgconfig, 0644))
Install headers in the correct location
2020-02-03 19:04:09 +02:00
Parse string context elements properly Prior to this change, we had a bunch of ad-hoc string manipulation code scattered around. This made it hard to figure out what data model for string contexts is. Now, we still store string contexts most of the time as encoded strings --- I was wary of the performance implications of changing that --- but whenever we parse them we do so only through the `NixStringContextElem::parse` method, which handles all cases. This creates a data type that is very similar to `DerivedPath` but: - Represents the funky `=<drvpath>` case as properly distinct from the others. - Only encodes a single output, no wildcards and no set, for the "built" case. (I would like to deprecate `=<path>`, after which we are in spitting distance of `DerivedPath` and could maybe get away with fewer types, but that is another topic for another day.)
2023-01-03 18:44:59 +02:00
$(foreach i, $(wildcard src/libexpr/value/*.hh), \
$(eval $(call install-file-in, $(i), $(includedir)/nix/value, 0644)))
Merge remote-tracking branch 'origin/master' into flakes
2020-03-11 18:03:38 +02:00
Fix a broken generated header file dependency https://hydra.nixos.org/build/240882042
2023-11-16 18:12:06 +02:00
$(d)/primops.cc: $(d)/imported-drv-to-derivation.nix.gen.hh
libexpr/local.mk: Make eval compile deps regular Dependency is now entirely through the eval.cc rule. All gen.hh deps are now there.
2023-11-27 16:50:45 +02:00
$(d)/eval.cc: $(d)/primops/derivation.nix.gen.hh $(d)/fetchurl.nix.gen.hh $(d)/flake/call-flake.nix.gen.hh
Enable -Werror=switch-enum switch statements must now match all enum values or disable the warning. Explicit is good. This has helped us find two bugs, after solving another one by debugging. From now on, adding to an enum will raise errors where they are not explicitly handled, which is good for productivity, and helps us decide the correct behavior in all usages. Notably still excluded from this though are the cases where the warning is disabled by local pragmas. fromTOML.cc did not build despite a top-level pragma, so I've had to resort to a makefile solution for that.
2023-04-03 19:11:42 +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
$(buildprefix)src/libexpr/primops/fromTOML.o: ERROR_SWITCH_ENUM =
Reference in a new issue Copy permalink