From 40395860c721165f0cc36dfd15b06bc1ea8590bc Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sun, 17 May 2020 16:43:21 +0100 Subject: chore(3p/nix): Remove old build system and other miscellanies There are still remnants of the old build system (for example, the build derivations are not yet updated at all), but we'll get there. --- third_party/nix/src/libexpr/local.mk | 33 ------------ third_party/nix/src/libmain/local.mk | 15 ------ third_party/nix/src/libstore/local.mk | 60 ---------------------- third_party/nix/src/libutil/local.mk | 9 ---- third_party/nix/src/nix/local.mk | 25 --------- .../nix/src/resolve-system-dependencies/local.mk | 11 ---- 6 files changed, 153 deletions(-) delete mode 100644 third_party/nix/src/libexpr/local.mk delete mode 100644 third_party/nix/src/libmain/local.mk delete mode 100644 third_party/nix/src/libstore/local.mk delete mode 100644 third_party/nix/src/libutil/local.mk delete mode 100644 third_party/nix/src/nix/local.mk delete mode 100644 third_party/nix/src/resolve-system-dependencies/local.mk (limited to 'third_party/nix/src') diff --git a/third_party/nix/src/libexpr/local.mk b/third_party/nix/src/libexpr/local.mk deleted file mode 100644 index ccd5293e4e5e..000000000000 --- a/third_party/nix/src/libexpr/local.mk +++ /dev/null @@ -1,33 +0,0 @@ -libraries += libexpr - -libexpr_NAME = libnixexpr - -libexpr_DIR := $(d) - -libexpr_SOURCES := $(wildcard $(d)/*.cc) $(wildcard $(d)/primops/*.cc) $(d)/lexer-tab.cc $(d)/parser-tab.cc - -libexpr_LIBS = libutil libstore - -libexpr_LDFLAGS = -ifneq ($(OS), FreeBSD) - libexpr_LDFLAGS += -ldl -endif - -# 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) - -libexpr_ORDER_AFTER := $(d)/parser-tab.cc $(d)/parser-tab.hh $(d)/lexer-tab.cc $(d)/lexer-tab.hh - -$(d)/parser-tab.cc $(d)/parser-tab.hh: $(d)/parser.y - $(trace-gen) bison -v -o $(libexpr_DIR)/parser-tab.cc $< -d - -$(d)/lexer-tab.cc $(d)/lexer-tab.hh: $(d)/lexer.l - $(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 - -dist-files += $(d)/parser-tab.cc $(d)/parser-tab.hh $(d)/lexer-tab.cc $(d)/lexer-tab.hh - -$(eval $(call install-file-in, $(d)/nix-expr.pc, $(prefix)/lib/pkgconfig, 0644)) diff --git a/third_party/nix/src/libmain/local.mk b/third_party/nix/src/libmain/local.mk deleted file mode 100644 index 0c80f5a0a037..000000000000 --- a/third_party/nix/src/libmain/local.mk +++ /dev/null @@ -1,15 +0,0 @@ -libraries += libmain - -libmain_NAME = libnixmain - -libmain_DIR := $(d) - -libmain_SOURCES := $(wildcard $(d)/*.cc) - -libmain_LDFLAGS = $(OPENSSL_LIBS) - -libmain_LIBS = libstore libutil - -libmain_ALLOW_UNDEFINED = 1 - -$(eval $(call install-file-in, $(d)/nix-main.pc, $(prefix)/lib/pkgconfig, 0644)) diff --git a/third_party/nix/src/libstore/local.mk b/third_party/nix/src/libstore/local.mk deleted file mode 100644 index d690fea28c23..000000000000 --- a/third_party/nix/src/libstore/local.mk +++ /dev/null @@ -1,60 +0,0 @@ -libraries += libstore - -libstore_NAME = libnixstore - -libstore_DIR := $(d) - -libstore_SOURCES := $(wildcard $(d)/*.cc $(d)/builtins/*.cc) - -libstore_LIBS = libutil - -libstore_LDFLAGS = $(SQLITE3_LIBS) -lbz2 $(LIBCURL_LIBS) $(SODIUM_LIBS) -pthread -ifneq ($(OS), FreeBSD) - libstore_LDFLAGS += -ldl -endif - -libstore_FILES = sandbox-defaults.sb sandbox-minimal.sb sandbox-network.sb - -$(foreach file,$(libstore_FILES),$(eval $(call install-data-in,$(d)/$(file),$(datadir)/nix/sandbox))) - -ifeq ($(ENABLE_S3), 1) - libstore_LDFLAGS += -laws-cpp-sdk-transfer -laws-cpp-sdk-s3 -laws-cpp-sdk-core -endif - -ifeq ($(OS), SunOS) - libstore_LDFLAGS += -lsocket -endif - -ifeq ($(HAVE_SECCOMP), 1) - libstore_LDFLAGS += -lseccomp -endif - -libstore_CXXFLAGS = \ - -DNIX_PREFIX=\"$(prefix)\" \ - -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)\" \ - -DNIX_BIN_DIR=\"$(bindir)\" \ - -DNIX_MAN_DIR=\"$(mandir)\" \ - -DLSOF=\"$(lsof)\" - -ifneq ($(sandbox_shell),) -libstore_CXXFLAGS += -DSANDBOX_SHELL="\"$(sandbox_shell)\"" -endif - -$(d)/local-store.cc: $(d)/schema.sql.gen.hh - -$(d)/build.cc: - -%.gen.hh: % - @echo 'R"foo(' >> $@.tmp - $(trace-gen) cat $< >> $@.tmp - @echo ')foo"' >> $@.tmp - @mv $@.tmp $@ - -clean-files += $(d)/schema.sql.gen.hh - -$(eval $(call install-file-in, $(d)/nix-store.pc, $(prefix)/lib/pkgconfig, 0644)) diff --git a/third_party/nix/src/libutil/local.mk b/third_party/nix/src/libutil/local.mk deleted file mode 100644 index e41a67d1f9e1..000000000000 --- a/third_party/nix/src/libutil/local.mk +++ /dev/null @@ -1,9 +0,0 @@ -libraries += libutil - -libutil_NAME = libnixutil - -libutil_DIR := $(d) - -libutil_SOURCES := $(wildcard $(d)/*.cc) - -libutil_LDFLAGS = $(LIBLZMA_LIBS) -lbz2 -pthread $(OPENSSL_LIBS) $(LIBBROTLI_LIBS) $(BOOST_LDFLAGS) -lboost_context diff --git a/third_party/nix/src/nix/local.mk b/third_party/nix/src/nix/local.mk deleted file mode 100644 index c09efd1fc895..000000000000 --- a/third_party/nix/src/nix/local.mk +++ /dev/null @@ -1,25 +0,0 @@ -programs += nix - -nix_DIR := $(d) - -nix_SOURCES := \ - $(wildcard $(d)/*.cc) \ - $(wildcard src/build-remote/*.cc) \ - $(wildcard src/nix-build/*.cc) \ - $(wildcard src/nix-channel/*.cc) \ - $(wildcard src/nix-collect-garbage/*.cc) \ - $(wildcard src/nix-copy-closure/*.cc) \ - $(wildcard src/nix-daemon/*.cc) \ - $(wildcard src/nix-env/*.cc) \ - $(wildcard src/nix-instantiate/*.cc) \ - $(wildcard src/nix-prefetch-url/*.cc) \ - $(wildcard src/nix-store/*.cc) \ - -nix_LIBS = libexpr libmain libstore libutil - -nix_LDFLAGS = -pthread $(SODIUM_LIBS) $(EDITLINE_LIBS) $(BOOST_LDFLAGS) -lboost_context -lboost_thread -lboost_system - -$(foreach name, \ - nix-build nix-channel nix-collect-garbage nix-copy-closure nix-daemon nix-env nix-hash nix-instantiate nix-prefetch-url nix-shell nix-store, \ - $(eval $(call install-symlink, nix, $(bindir)/$(name)))) -$(eval $(call install-symlink, $(bindir)/nix, $(libexecdir)/nix/build-remote)) diff --git a/third_party/nix/src/resolve-system-dependencies/local.mk b/third_party/nix/src/resolve-system-dependencies/local.mk deleted file mode 100644 index f9db16268be0..000000000000 --- a/third_party/nix/src/resolve-system-dependencies/local.mk +++ /dev/null @@ -1,11 +0,0 @@ -ifeq ($(OS), Darwin) - programs += resolve-system-dependencies -endif - -resolve-system-dependencies_DIR := $(d) - -resolve-system-dependencies_INSTALL_DIR := $(libexecdir)/nix - -resolve-system-dependencies_LIBS := libstore libmain libutil - -resolve-system-dependencies_SOURCES := $(d)/resolve-system-dependencies.cc -- cgit 1.4.1