From 318153f4c27973b6c16e83ba284f552b3f1fb0ce Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 5 Jan 2019 13:30:42 -0500 Subject: [PATCH 1/4] Remove dead code computing `dynlib_suffix` from comfigure.ac --- configure.ac | 5 ----- 1 file changed, 5 deletions(-) diff --git a/configure.ac b/configure.ac index 85fec77a2..258919547 100644 --- a/configure.ac +++ b/configure.ac @@ -253,11 +253,6 @@ if test "$(uname)" = "Darwin"; then fi -# Figure out the extension of dynamic libraries. -eval dynlib_suffix=$shrext_cmds -AC_SUBST(dynlib_suffix) - - # Do we have GNU tar? AC_MSG_CHECKING([if you have a recent GNU tar]) if $tar --version 2> /dev/null | grep -q GNU && tar cvf /dev/null --warning=no-timestamp ./config.log > /dev/null; then From e10d6ed2a7463d8a36b94bfc8769e6aea32c0efd Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 5 Jan 2019 14:25:54 -0500 Subject: [PATCH 2/4] brotli is only used as a library now --- Makefile.config.in | 1 - configure.ac | 1 - src/libutil/local.mk | 2 -- 3 files changed, 4 deletions(-) diff --git a/Makefile.config.in b/Makefile.config.in index fad077d86..b01a4afbf 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -18,7 +18,6 @@ LIBBROTLI_LIBS = @LIBBROTLI_LIBS@ EDITLINE_LIBS = @EDITLINE_LIBS@ bash = @bash@ bindir = @bindir@ -brotli = @brotli@ lsof = @lsof@ datadir = @datadir@ datarootdir = @datarootdir@ diff --git a/configure.ac b/configure.ac index 258919547..69aa9a946 100644 --- a/configure.ac +++ b/configure.ac @@ -128,7 +128,6 @@ NEED_PROG(gzip, gzip) NEED_PROG(xz, xz) AC_PATH_PROG(dot, dot) AC_PATH_PROG(pv, pv, pv) -AC_PATH_PROGS(brotli, brotli bro, bro) AC_PATH_PROG(lsof, lsof, lsof) diff --git a/src/libutil/local.mk b/src/libutil/local.mk index 824f48fbf..21c1e78cc 100644 --- a/src/libutil/local.mk +++ b/src/libutil/local.mk @@ -9,5 +9,3 @@ libutil_SOURCES := $(wildcard $(d)/*.cc) libutil_LDFLAGS = $(LIBLZMA_LIBS) -lbz2 -pthread $(OPENSSL_LIBS) $(LIBBROTLI_LIBS) -lboost_context libutil_LIBS = libformat - -libutil_CXXFLAGS = -DBROTLI=\"$(brotli)\" From fef9f5653ba656d0028b5bea8f4e1c6571e5573a Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 5 Jan 2019 14:31:29 -0500 Subject: [PATCH 3/4] Remove mentions of `libformat`, it no longer exists --- src/libexpr/local.mk | 2 +- src/libmain/local.mk | 2 +- src/libstore/local.mk | 2 +- src/libutil/local.mk | 2 -- src/nix/local.mk | 2 +- src/resolve-system-dependencies/local.mk | 2 +- 6 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/libexpr/local.mk b/src/libexpr/local.mk index daa3258f0..ccd5293e4 100644 --- a/src/libexpr/local.mk +++ b/src/libexpr/local.mk @@ -6,7 +6,7 @@ libexpr_DIR := $(d) libexpr_SOURCES := $(wildcard $(d)/*.cc) $(wildcard $(d)/primops/*.cc) $(d)/lexer-tab.cc $(d)/parser-tab.cc -libexpr_LIBS = libutil libstore libformat +libexpr_LIBS = libutil libstore libexpr_LDFLAGS = ifneq ($(OS), FreeBSD) diff --git a/src/libmain/local.mk b/src/libmain/local.mk index f1fd3eb72..0c80f5a0a 100644 --- a/src/libmain/local.mk +++ b/src/libmain/local.mk @@ -8,7 +8,7 @@ libmain_SOURCES := $(wildcard $(d)/*.cc) libmain_LDFLAGS = $(OPENSSL_LIBS) -libmain_LIBS = libstore libutil libformat +libmain_LIBS = libstore libutil libmain_ALLOW_UNDEFINED = 1 diff --git a/src/libstore/local.mk b/src/libstore/local.mk index 3799257f8..89fc918c3 100644 --- a/src/libstore/local.mk +++ b/src/libstore/local.mk @@ -6,7 +6,7 @@ libstore_DIR := $(d) libstore_SOURCES := $(wildcard $(d)/*.cc $(d)/builtins/*.cc) -libstore_LIBS = libutil libformat +libstore_LIBS = libutil libstore_LDFLAGS = $(SQLITE3_LIBS) -lbz2 $(LIBCURL_LIBS) $(SODIUM_LIBS) -pthread ifneq ($(OS), FreeBSD) diff --git a/src/libutil/local.mk b/src/libutil/local.mk index 21c1e78cc..3ccc23fd5 100644 --- a/src/libutil/local.mk +++ b/src/libutil/local.mk @@ -7,5 +7,3 @@ libutil_DIR := $(d) libutil_SOURCES := $(wildcard $(d)/*.cc) libutil_LDFLAGS = $(LIBLZMA_LIBS) -lbz2 -pthread $(OPENSSL_LIBS) $(LIBBROTLI_LIBS) -lboost_context - -libutil_LIBS = libformat diff --git a/src/nix/local.mk b/src/nix/local.mk index 40a0e8d6b..ca4604d56 100644 --- a/src/nix/local.mk +++ b/src/nix/local.mk @@ -15,7 +15,7 @@ nix_SOURCES := \ $(wildcard src/nix-prefetch-url/*.cc) \ $(wildcard src/nix-store/*.cc) \ -nix_LIBS = libexpr libmain libstore libutil libformat +nix_LIBS = libexpr libmain libstore libutil nix_LDFLAGS = -pthread $(SODIUM_LIBS) $(EDITLINE_LIBS) diff --git a/src/resolve-system-dependencies/local.mk b/src/resolve-system-dependencies/local.mk index 8792a4a25..f9db16268 100644 --- a/src/resolve-system-dependencies/local.mk +++ b/src/resolve-system-dependencies/local.mk @@ -6,6 +6,6 @@ resolve-system-dependencies_DIR := $(d) resolve-system-dependencies_INSTALL_DIR := $(libexecdir)/nix -resolve-system-dependencies_LIBS := libstore libmain libutil libformat +resolve-system-dependencies_LIBS := libstore libmain libutil resolve-system-dependencies_SOURCES := $(d)/resolve-system-dependencies.cc From 27332870466c971d9c9bbc4a0955c7882468e132 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 7 Jan 2019 16:38:57 -0500 Subject: [PATCH 4/4] Don't look for a "pv" program, or mention it in the manual source The manual reference was commented out, and the sole reference to this program other than the configure script. Removed both. --- configure.ac | 1 - doc/manual/command-ref/nix-copy-closure.xml | 9 --------- 2 files changed, 10 deletions(-) diff --git a/configure.ac b/configure.ac index 69aa9a946..5a2526672 100644 --- a/configure.ac +++ b/configure.ac @@ -127,7 +127,6 @@ NEED_PROG(bzip2, bzip2) NEED_PROG(gzip, gzip) NEED_PROG(xz, xz) AC_PATH_PROG(dot, dot) -AC_PATH_PROG(pv, pv, pv) AC_PATH_PROG(lsof, lsof, lsof) diff --git a/doc/manual/command-ref/nix-copy-closure.xml b/doc/manual/command-ref/nix-copy-closure.xml index 800e1db6a..e6dcf180a 100644 --- a/doc/manual/command-ref/nix-copy-closure.xml +++ b/doc/manual/command-ref/nix-copy-closure.xml @@ -95,15 +95,6 @@ those paths. If this bothers you, use - - Also copy the outputs of store derivations