From b8e9efc476abc248a17c9e9cd117f3d53e4a7f63 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 22 Nov 2013 15:54:18 +0100 Subject: [PATCH 01/89] New non-recursive, plain Make-based build system --- .gitignore | 1 + Makefile.config.in | 10 +++++ Makefile.lib | 63 ++++++++++++++++++++++++++++++++ Makefile.new | 22 +++++++++++ configure.ac | 1 + src/boost/format/Makefile.new | 5 +++ src/libexpr/Makefile.new | 10 +++++ src/libmain/Makefile.new | 7 ++++ src/libstore/Makefile.new | 19 ++++++++++ src/libutil/Makefile.new | 10 +++++ src/nix-daemon/Makefile.new | 7 ++++ src/nix-env/Makefile.new | 7 ++++ src/nix-hash/Makefile.new | 7 ++++ src/nix-instantiate/Makefile.new | 7 ++++ src/nix-store/Makefile.new | 7 ++++ 15 files changed, 183 insertions(+) create mode 100644 Makefile.config.in create mode 100644 Makefile.lib create mode 100644 Makefile.new create mode 100644 src/boost/format/Makefile.new create mode 100644 src/libexpr/Makefile.new create mode 100644 src/libmain/Makefile.new create mode 100644 src/libstore/Makefile.new create mode 100644 src/libutil/Makefile.new create mode 100644 src/nix-daemon/Makefile.new create mode 100644 src/nix-env/Makefile.new create mode 100644 src/nix-hash/Makefile.new create mode 100644 src/nix-instantiate/Makefile.new create mode 100644 src/nix-store/Makefile.new diff --git a/.gitignore b/.gitignore index 5dc9af7fc0..a8f5a23791 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ Makefile Makefile.in +Makefile.config # / /aclocal.m4 diff --git a/Makefile.config.in b/Makefile.config.in new file mode 100644 index 0000000000..3bb8cdda48 --- /dev/null +++ b/Makefile.config.in @@ -0,0 +1,10 @@ +VERSION = @VERSION@ +bindir = @bindir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +exec_prefix = @exec_prefix@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +prefix = @prefix@ +storedir = @storedir@ +sysconfdir = @sysconfdir@ diff --git a/Makefile.lib b/Makefile.lib new file mode 100644 index 0000000000..d681cf7412 --- /dev/null +++ b/Makefile.lib @@ -0,0 +1,63 @@ +default: all + +here = $(dir $(lastword $(MAKEFILE_LIST))) + +LIBS = + +QUIET = @ + +%.o: %.cc + $(QUIET) g++ -o $@ -c $^ -g -fPIC $(CXXFLAGS) $($@_CXXFLAGS) + +%.o: %.c + $(QUIET) gcc -o $@ -c $^ -g -fPIC $(CFLAGS) $($@_CFLAGS) + + +# Generate Make rules for libraries. +libs_list := + +define LIBS_template = + _d := $$($(1)_DIR) + _objs := $$(foreach src, $$($(1)_SOURCES), $$(_d)$$(basename $$(src)).o) + _libs := $$(foreach lib, $$($(1)_LIBS), $$(lib).a) + _lib := $$(_d)$(1).a + + $$(_lib): $$(_objs) + $(QUIET) ar crs $$@ $$? + + # Propagate CXXFLAGS to the individual object files. + $$(foreach obj, $$(_objs), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS))) + + clean_list += $$(_lib) $$(_objs) + libs_list += $$(_lib) +endef + + +# Generate Make rules for programs. +programs_list := + +define PROGRAMS_template = + _d := $$($(1)_DIR) + _objs := $$(foreach src, $$($(1)_SOURCES), $$(_d)$$(basename $$(src)).o) + _libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_DIR)$$(lib).a) + _prog := $$(_d)$(1) + + $$(_prog): $$(_objs) $$(_libs) + $(QUIET) g++ -o $$@ $$^ $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS)) + + # Propagate CXXFLAGS to the individual object files. + $$(foreach obj, $$(_objs), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS))) + + clean_list += $$(_prog) $$(_objs) + programs_list += $$(_prog) +endef + + +# Cleaning stuff. +clean_list := + +clean: + rm -fv $(clean_list) + +dryclean: + @echo $(clean_list) diff --git a/Makefile.new b/Makefile.new new file mode 100644 index 0000000000..566f1f7be5 --- /dev/null +++ b/Makefile.new @@ -0,0 +1,22 @@ +include Makefile.config +include Makefile.lib + +include src/boost/format/Makefile.new +include src/libutil/Makefile.new +include src/libstore/Makefile.new +include src/libmain/Makefile.new +include src/libexpr/Makefile.new +include src/nix-hash/Makefile.new +include src/nix-store/Makefile.new +include src/nix-instantiate/Makefile.new +include src/nix-env/Makefile.new +include src/nix-daemon/Makefile.new + +CXXFLAGS = -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr + +CFLAGS = + +$(foreach lib, $(LIBS), $(eval $(call LIBS_template,$(lib)))) +$(foreach prog, $(PROGRAMS), $(eval $(call PROGRAMS_template,$(prog)))) + +all: $(programs_list) diff --git a/configure.ac b/configure.ac index 7acd575574..c64766a2d2 100644 --- a/configure.ac +++ b/configure.ac @@ -385,5 +385,6 @@ AC_CONFIG_FILES([Makefile misc/Makefile misc/emacs/Makefile tests/Makefile + Makefile.config ]) AC_OUTPUT diff --git a/src/boost/format/Makefile.new b/src/boost/format/Makefile.new new file mode 100644 index 0000000000..28b66bd62d --- /dev/null +++ b/src/boost/format/Makefile.new @@ -0,0 +1,5 @@ +LIBS += libformat + +libformat_DIR := $(here) + +libformat_SOURCES = format_implementation.cc free_funcs.cc parsing.cc diff --git a/src/libexpr/Makefile.new b/src/libexpr/Makefile.new new file mode 100644 index 0000000000..f6c9004315 --- /dev/null +++ b/src/libexpr/Makefile.new @@ -0,0 +1,10 @@ +LIBS += libexpr + +libexpr_DIR := $(here) + +libexpr_SOURCES = \ + nixexpr.cc eval.cc primops.cc lexer-tab.cc parser-tab.cc \ + get-drvs.cc attr-path.cc value-to-xml.cc value-to-json.cc \ + common-opts.cc names.cc + +# FIXME: add rules for parser-tab.cc / lexer-tab.cc. diff --git a/src/libmain/Makefile.new b/src/libmain/Makefile.new new file mode 100644 index 0000000000..1f74cea9c9 --- /dev/null +++ b/src/libmain/Makefile.new @@ -0,0 +1,7 @@ +LIBS += libmain + +libmain_DIR := $(here) + +libmain_SOURCES = shared.cc stack.cc + +libmain_LDFLAGS = -lgc diff --git a/src/libstore/Makefile.new b/src/libstore/Makefile.new new file mode 100644 index 0000000000..24011c2443 --- /dev/null +++ b/src/libstore/Makefile.new @@ -0,0 +1,19 @@ +LIBS += libstore + +libstore_DIR := $(here) + +libstore_SOURCES = \ + store-api.cc local-store.cc remote-store.cc derivations.cc build.cc misc.cc \ + globals.cc references.cc pathlocks.cc gc.cc optimise-store.cc + +libstore_LDFLAGS = -lsqlite3 -lbz2 + +libstore_CXXFLAGS = \ + -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_VERSION=\"$(VERSION)\" diff --git a/src/libutil/Makefile.new b/src/libutil/Makefile.new new file mode 100644 index 0000000000..b90c1c0cab --- /dev/null +++ b/src/libutil/Makefile.new @@ -0,0 +1,10 @@ +LIBS += libutil + +libutil_DIR := $(here) + +libutil_SOURCES = util.cc hash.cc serialise.cc archive.cc xml-writer.cc affinity.cc \ + md5.c sha1.c sha256.c + +# FIXME: md5.c et al. should only be built when we don't have OpenSSL. + +libutil_LIBS = src/boost/format/libformat diff --git a/src/nix-daemon/Makefile.new b/src/nix-daemon/Makefile.new new file mode 100644 index 0000000000..a2d98e7905 --- /dev/null +++ b/src/nix-daemon/Makefile.new @@ -0,0 +1,7 @@ +PROGRAMS += nix-daemon + +nix-daemon_DIR := $(here) + +nix-daemon_SOURCES = nix-daemon.cc + +nix-daemon_LIBS = libmain libstore libutil libformat diff --git a/src/nix-env/Makefile.new b/src/nix-env/Makefile.new new file mode 100644 index 0000000000..5c92274f3c --- /dev/null +++ b/src/nix-env/Makefile.new @@ -0,0 +1,7 @@ +PROGRAMS += nix-env + +nix-env_DIR := $(here) + +nix-env_SOURCES = nix-env.cc profiles.cc profiles.hh user-env.cc user-env.hh + +nix-env_LIBS = libexpr libmain libstore libutil libformat diff --git a/src/nix-hash/Makefile.new b/src/nix-hash/Makefile.new new file mode 100644 index 0000000000..87aba716cb --- /dev/null +++ b/src/nix-hash/Makefile.new @@ -0,0 +1,7 @@ +PROGRAMS += nix-hash + +nix-hash_DIR := $(here) + +nix-hash_SOURCES = nix-hash.cc + +nix-hash_LIBS = libmain libstore libutil libformat diff --git a/src/nix-instantiate/Makefile.new b/src/nix-instantiate/Makefile.new new file mode 100644 index 0000000000..71e40706ae --- /dev/null +++ b/src/nix-instantiate/Makefile.new @@ -0,0 +1,7 @@ +PROGRAMS += nix-instantiate + +nix-instantiate_DIR := $(here) + +nix-instantiate_SOURCES = nix-instantiate.cc + +nix-instantiate_LIBS = libexpr libmain libstore libutil libformat diff --git a/src/nix-store/Makefile.new b/src/nix-store/Makefile.new new file mode 100644 index 0000000000..195d05a2d6 --- /dev/null +++ b/src/nix-store/Makefile.new @@ -0,0 +1,7 @@ +PROGRAMS += nix-store + +nix-store_DIR := $(here) + +nix-store_SOURCES = nix-store.cc dotgraph.cc xmlgraph.cc + +nix-store_LIBS = libmain libstore libutil libformat From bc96c4518e4430f0cd996b2c77fe8e08d7694efa Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 22 Nov 2013 15:10:33 +0000 Subject: [PATCH 02/89] Automatically emit make rules for header files --- .gitignore | 1 + Makefile.lib | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index a8f5a23791..ed9bd45a45 100644 --- a/.gitignore +++ b/.gitignore @@ -129,6 +129,7 @@ Makefile.config *.la *.o *.so +*.dep *~ # GNU Global diff --git a/Makefile.lib b/Makefile.lib index d681cf7412..1aec37c76f 100644 --- a/Makefile.lib +++ b/Makefile.lib @@ -7,10 +7,10 @@ LIBS = QUIET = @ %.o: %.cc - $(QUIET) g++ -o $@ -c $^ -g -fPIC $(CXXFLAGS) $($@_CXXFLAGS) + $(QUIET) g++ -o $@ -c $< -g -fPIC $(CXXFLAGS) $($@_CXXFLAGS) -MMD -MF $(basename $@).dep -MP %.o: %.c - $(QUIET) gcc -o $@ -c $^ -g -fPIC $(CFLAGS) $($@_CFLAGS) + $(QUIET) gcc -o $@ -c $< -g -fPIC $(CFLAGS) $($@_CFLAGS) -MMD -MF $(basename $@).dep -MP # Generate Make rules for libraries. @@ -28,7 +28,9 @@ define LIBS_template = # Propagate CXXFLAGS to the individual object files. $$(foreach obj, $$(_objs), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS))) - clean_list += $$(_lib) $$(_objs) + include $$(wildcard $$(_d)/*.dep) + + clean_list += $$(_lib) $$(_objs) $$(_d)*.dep libs_list += $$(_lib) endef @@ -48,7 +50,7 @@ define PROGRAMS_template = # Propagate CXXFLAGS to the individual object files. $$(foreach obj, $$(_objs), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS))) - clean_list += $$(_prog) $$(_objs) + clean_list += $$(_prog) $$(_objs) $$(_d)*.dep programs_list += $$(_prog) endef From 1474ecfe426ef69bbb376df82fd0c48e7dedf606 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 22 Nov 2013 16:22:31 +0100 Subject: [PATCH 03/89] Generate the parser and the lexer --- src/libexpr/Makefile.new | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/libexpr/Makefile.new b/src/libexpr/Makefile.new index f6c9004315..5664365841 100644 --- a/src/libexpr/Makefile.new +++ b/src/libexpr/Makefile.new @@ -7,4 +7,8 @@ libexpr_SOURCES = \ get-drvs.cc attr-path.cc value-to-xml.cc value-to-json.cc \ common-opts.cc names.cc -# FIXME: add rules for parser-tab.cc / lexer-tab.cc. +$(here)parser-tab.cc $(here)parser-tab.hh: $(here)parser.y + bison -v -o $(here)parser-tab.cc $< -d + +$(here)lexer-tab.cc $(here)lexer-tab.hh: $(here)lexer.l + flex --outfile $(here)lexer-tab.cc --header-file=$(here)lexer-tab.hh $< From eaf903f993094af27958b9935635710ffbf42bf6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 22 Nov 2013 16:24:41 +0100 Subject: [PATCH 04/89] Clean more aggressively --- Makefile.lib | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.lib b/Makefile.lib index 1aec37c76f..5d9910e35b 100644 --- a/Makefile.lib +++ b/Makefile.lib @@ -30,7 +30,7 @@ define LIBS_template = include $$(wildcard $$(_d)/*.dep) - clean_list += $$(_lib) $$(_objs) $$(_d)*.dep + clean_list += $$(_d)*.a $$(_d)*.o $$(_d)*.dep libs_list += $$(_lib) endef @@ -50,7 +50,7 @@ define PROGRAMS_template = # Propagate CXXFLAGS to the individual object files. $$(foreach obj, $$(_objs), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS))) - clean_list += $$(_prog) $$(_objs) $$(_d)*.dep + clean_list += $$(_prog) $$(_d)*.o $$(_d)*.dep programs_list += $$(_prog) endef From e0a108b203b40f81df4cb0f1e433476cd8a37491 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 22 Nov 2013 15:25:10 +0000 Subject: [PATCH 05/89] Remove unnecessary line --- Makefile.lib | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makefile.lib b/Makefile.lib index 5d9910e35b..79078c83be 100644 --- a/Makefile.lib +++ b/Makefile.lib @@ -2,8 +2,6 @@ default: all here = $(dir $(lastword $(MAKEFILE_LIST))) -LIBS = - QUIET = @ %.o: %.cc From eff6c4b791ad0a8b9a8499fcbcc2add7154d4dca Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 22 Nov 2013 15:41:48 +0000 Subject: [PATCH 06/89] Add missing #include --- src/nix-env/user-env.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nix-env/user-env.cc b/src/nix-env/user-env.cc index c2dab4f0c7..3a73f2647a 100644 --- a/src/nix-env/user-env.cc +++ b/src/nix-env/user-env.cc @@ -1,5 +1,5 @@ +#include "user-env.hh" #include "util.hh" -#include "get-drvs.hh" #include "derivations.hh" #include "store-api.hh" #include "globals.hh" From 62e35cc3a893e3bc4ed1fe2a37ba67af9859b4cb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 22 Nov 2013 16:42:25 +0100 Subject: [PATCH 07/89] =?UTF-8?q?Add=20=E2=80=98make=20dist=E2=80=99=20sup?= =?UTF-8?q?port?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile.config.in | 3 ++- Makefile.lib | 24 ++++++++++++++++++++---- src/libstore/Makefile.new | 2 +- 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/Makefile.config.in b/Makefile.config.in index 3bb8cdda48..25e537bcca 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -1,4 +1,5 @@ -VERSION = @VERSION@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ bindir = @bindir@ datadir = @datadir@ datarootdir = @datarootdir@ diff --git a/Makefile.lib b/Makefile.lib index 79078c83be..c7880ff114 100644 --- a/Makefile.lib +++ b/Makefile.lib @@ -16,7 +16,8 @@ libs_list := define LIBS_template = _d := $$($(1)_DIR) - _objs := $$(foreach src, $$($(1)_SOURCES), $$(_d)$$(basename $$(src)).o) + _srcs := $$(foreach src, $$($(1)_SOURCES), $$(_d)$$(src)) + _objs := $$(addsuffix .o, $$(basename $$(_srcs))) _libs := $$(foreach lib, $$($(1)_LIBS), $$(lib).a) _lib := $$(_d)$(1).a @@ -28,8 +29,9 @@ define LIBS_template = include $$(wildcard $$(_d)/*.dep) - clean_list += $$(_d)*.a $$(_d)*.o $$(_d)*.dep libs_list += $$(_lib) + clean_list += $$(_d)*.a $$(_d)*.o $$(_d)*.dep + dist_files += $$(_srcs) endef @@ -38,7 +40,8 @@ programs_list := define PROGRAMS_template = _d := $$($(1)_DIR) - _objs := $$(foreach src, $$($(1)_SOURCES), $$(_d)$$(basename $$(src)).o) + _srcs := $$(foreach src, $$($(1)_SOURCES), $$(_d)$$(src)) + _objs := $$(addsuffix .o, $$(basename $$(_srcs))) _libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_DIR)$$(lib).a) _prog := $$(_d)$(1) @@ -48,11 +51,24 @@ define PROGRAMS_template = # Propagate CXXFLAGS to the individual object files. $$(foreach obj, $$(_objs), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS))) - clean_list += $$(_prog) $$(_d)*.o $$(_d)*.dep + include $$(wildcard $$(_d)/*.dep) + programs_list += $$(_prog) + clean_list += $$(_prog) $$(_d)*.o $$(_d)*.dep + dist_files += $$(_srcs) endef +# Distributing stuff. +dist_files := + +dist_name = $(PACKAGE_NAME)-$(PACKAGE_VERSION) + +dist: + @echo $(dist_files) + $(QUIET) tar cvfj $(dist_name).tar.bz2 $(dist_files) --transform 's,^,$(dist_name)/,' + + # Cleaning stuff. clean_list := diff --git a/src/libstore/Makefile.new b/src/libstore/Makefile.new index 24011c2443..7b08af047e 100644 --- a/src/libstore/Makefile.new +++ b/src/libstore/Makefile.new @@ -16,4 +16,4 @@ libstore_CXXFLAGS = \ -DNIX_CONF_DIR=\"$(sysconfdir)/nix\" \ -DNIX_LIBEXEC_DIR=\"$(libexecdir)\" \ -DNIX_BIN_DIR=\"$(bindir)\" \ - -DNIX_VERSION=\"$(VERSION)\" + -DNIX_VERSION=\"$(PACKAGE_VERSION)\" From ffdc85fc8afba0828bd1f300fdb4f68de99d7000 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 22 Nov 2013 15:47:47 +0000 Subject: [PATCH 08/89] Respect configure flags --- Makefile.config.in | 4 ++++ Makefile.lib | 4 ++-- Makefile.new | 4 +--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile.config.in b/Makefile.config.in index 25e537bcca..e5a6f4c68d 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -1,3 +1,7 @@ +CC = @CC@ +CFLAGS = @CFLAGS@ +CXX = @CXX@ +CXXFLAGS = @CXXFLAGS@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ bindir = @bindir@ diff --git a/Makefile.lib b/Makefile.lib index c7880ff114..449f19ad50 100644 --- a/Makefile.lib +++ b/Makefile.lib @@ -5,10 +5,10 @@ here = $(dir $(lastword $(MAKEFILE_LIST))) QUIET = @ %.o: %.cc - $(QUIET) g++ -o $@ -c $< -g -fPIC $(CXXFLAGS) $($@_CXXFLAGS) -MMD -MF $(basename $@).dep -MP + $(QUIET) $(CXX) -o $@ -c $< -g -fPIC $(CXXFLAGS) $($@_CXXFLAGS) -MMD -MF $(basename $@).dep -MP %.o: %.c - $(QUIET) gcc -o $@ -c $< -g -fPIC $(CFLAGS) $($@_CFLAGS) -MMD -MF $(basename $@).dep -MP + $(QUIET) $(CC) -o $@ -c $< -g -fPIC $(CFLAGS) $($@_CFLAGS) -MMD -MF $(basename $@).dep -MP # Generate Make rules for libraries. diff --git a/Makefile.new b/Makefile.new index 566f1f7be5..8911d6d72c 100644 --- a/Makefile.new +++ b/Makefile.new @@ -12,9 +12,7 @@ include src/nix-instantiate/Makefile.new include src/nix-env/Makefile.new include src/nix-daemon/Makefile.new -CXXFLAGS = -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr - -CFLAGS = +CXXFLAGS += -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr $(foreach lib, $(LIBS), $(eval $(call LIBS_template,$(lib)))) $(foreach prog, $(PROGRAMS), $(eval $(call PROGRAMS_template,$(prog)))) From 9a14d5e2f3a0b6ab626b9d22256df8bcc1c585a3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 22 Nov 2013 16:59:09 +0100 Subject: [PATCH 09/89] Automatically regenerate Makefile.config And move some stuff around. --- Makefile.lib | 20 +++++++++++++++----- Makefile.new | 12 +++++------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/Makefile.lib b/Makefile.lib index 449f19ad50..b6d31e7ce8 100644 --- a/Makefile.lib +++ b/Makefile.lib @@ -1,6 +1,12 @@ -default: all +# Include Autoconf variables. +Makefile.config: Makefile.config.in + ./config.status + +include Makefile.config + +clean_list := +dist_files := -here = $(dir $(lastword $(MAKEFILE_LIST))) QUIET = @ @@ -34,6 +40,8 @@ define LIBS_template = dist_files += $$(_srcs) endef +$(foreach lib, $(LIBS), $(eval $(call LIBS_template,$(lib)))) + # Generate Make rules for programs. programs_list := @@ -58,10 +66,10 @@ define PROGRAMS_template = dist_files += $$(_srcs) endef +$(foreach prog, $(PROGRAMS), $(eval $(call PROGRAMS_template,$(prog)))) + # Distributing stuff. -dist_files := - dist_name = $(PACKAGE_NAME)-$(PACKAGE_VERSION) dist: @@ -70,10 +78,12 @@ dist: # Cleaning stuff. -clean_list := clean: rm -fv $(clean_list) dryclean: @echo $(clean_list) + + +all: $(programs_list) diff --git a/Makefile.new b/Makefile.new index 8911d6d72c..ea4096cc1c 100644 --- a/Makefile.new +++ b/Makefile.new @@ -1,5 +1,6 @@ -include Makefile.config -include Makefile.lib +default: all + +here = $(dir $(lastword $(MAKEFILE_LIST))) include src/boost/format/Makefile.new include src/libutil/Makefile.new @@ -12,9 +13,6 @@ include src/nix-instantiate/Makefile.new include src/nix-env/Makefile.new include src/nix-daemon/Makefile.new +include Makefile.lib + CXXFLAGS += -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr - -$(foreach lib, $(LIBS), $(eval $(call LIBS_template,$(lib)))) -$(foreach prog, $(PROGRAMS), $(eval $(call PROGRAMS_template,$(prog)))) - -all: $(programs_list) From 754c05ed6c3b88f8180ae8686e030b5b02b23d43 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 22 Nov 2013 16:45:52 +0000 Subject: [PATCH 10/89] Rename $(here) to $(d) for brevity, and remove trailing slash --- Makefile.lib | 26 +++++++++++++++++++------- Makefile.new | 27 ++++++++++++--------------- src/boost/format/Makefile.new | 2 +- src/libexpr/Makefile.new | 10 +++++----- src/libmain/Makefile.new | 2 +- src/libstore/Makefile.new | 2 +- src/libutil/Makefile.new | 9 +++++---- src/nix-daemon/Makefile.new | 2 +- src/nix-env/Makefile.new | 2 +- src/nix-hash/Makefile.new | 2 +- src/nix-instantiate/Makefile.new | 2 +- src/nix-store/Makefile.new | 2 +- 12 files changed, 49 insertions(+), 39 deletions(-) diff --git a/Makefile.lib b/Makefile.lib index b6d31e7ce8..f2eea7ac81 100644 --- a/Makefile.lib +++ b/Makefile.lib @@ -1,3 +1,15 @@ +default: all + + +# Include all sub-Makefiles. +define include_sub_makefile = + d := $$(patsubst %/, %, $$(dir $(1))) + include $(1) +endef + +$(foreach mf, $(SUBS), $(eval $(call include_sub_makefile, $(mf)))) + + # Include Autoconf variables. Makefile.config: Makefile.config.in ./config.status @@ -22,10 +34,10 @@ libs_list := define LIBS_template = _d := $$($(1)_DIR) - _srcs := $$(foreach src, $$($(1)_SOURCES), $$(_d)$$(src)) + _srcs := $$(foreach src, $$($(1)_SOURCES), $$(_d)/$$(src)) _objs := $$(addsuffix .o, $$(basename $$(_srcs))) _libs := $$(foreach lib, $$($(1)_LIBS), $$(lib).a) - _lib := $$(_d)$(1).a + _lib := $$(_d)/$(1).a $$(_lib): $$(_objs) $(QUIET) ar crs $$@ $$? @@ -36,7 +48,7 @@ define LIBS_template = include $$(wildcard $$(_d)/*.dep) libs_list += $$(_lib) - clean_list += $$(_d)*.a $$(_d)*.o $$(_d)*.dep + clean_list += $$(_d)/*.a $$(_d)/*.o $$(_d)/*.dep dist_files += $$(_srcs) endef @@ -48,10 +60,10 @@ programs_list := define PROGRAMS_template = _d := $$($(1)_DIR) - _srcs := $$(foreach src, $$($(1)_SOURCES), $$(_d)$$(src)) + _srcs := $$(foreach src, $$($(1)_SOURCES), $$(_d)/$$(src)) _objs := $$(addsuffix .o, $$(basename $$(_srcs))) - _libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_DIR)$$(lib).a) - _prog := $$(_d)$(1) + _libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_DIR)/$$(lib).a) + _prog := $$(_d)/$(1) $$(_prog): $$(_objs) $$(_libs) $(QUIET) g++ -o $$@ $$^ $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS)) @@ -62,7 +74,7 @@ define PROGRAMS_template = include $$(wildcard $$(_d)/*.dep) programs_list += $$(_prog) - clean_list += $$(_prog) $$(_d)*.o $$(_d)*.dep + clean_list += $$(_prog) $$(_d)/*.o $$(_d)/*.dep dist_files += $$(_srcs) endef diff --git a/Makefile.new b/Makefile.new index ea4096cc1c..af2c4cec3c 100644 --- a/Makefile.new +++ b/Makefile.new @@ -1,18 +1,15 @@ -default: all - -here = $(dir $(lastword $(MAKEFILE_LIST))) - -include src/boost/format/Makefile.new -include src/libutil/Makefile.new -include src/libstore/Makefile.new -include src/libmain/Makefile.new -include src/libexpr/Makefile.new -include src/nix-hash/Makefile.new -include src/nix-store/Makefile.new -include src/nix-instantiate/Makefile.new -include src/nix-env/Makefile.new -include src/nix-daemon/Makefile.new +SUBS = \ + src/boost/format/Makefile.new \ + src/libutil/Makefile.new \ + src/libstore/Makefile.new \ + src/libmain/Makefile.new \ + src/libexpr/Makefile.new \ + src/nix-hash/Makefile.new \ + src/nix-store/Makefile.new \ + src/nix-instantiate/Makefile.new \ + src/nix-env/Makefile.new \ + src/nix-daemon/Makefile.new include Makefile.lib -CXXFLAGS += -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr +CXXFLAGS += -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr -O0 diff --git a/src/boost/format/Makefile.new b/src/boost/format/Makefile.new index 28b66bd62d..bbc90ca76c 100644 --- a/src/boost/format/Makefile.new +++ b/src/boost/format/Makefile.new @@ -1,5 +1,5 @@ LIBS += libformat -libformat_DIR := $(here) +libformat_DIR := $(d) libformat_SOURCES = format_implementation.cc free_funcs.cc parsing.cc diff --git a/src/libexpr/Makefile.new b/src/libexpr/Makefile.new index 5664365841..3fd4fc7b21 100644 --- a/src/libexpr/Makefile.new +++ b/src/libexpr/Makefile.new @@ -1,14 +1,14 @@ LIBS += libexpr -libexpr_DIR := $(here) +libexpr_DIR := $(d) libexpr_SOURCES = \ nixexpr.cc eval.cc primops.cc lexer-tab.cc parser-tab.cc \ get-drvs.cc attr-path.cc value-to-xml.cc value-to-json.cc \ common-opts.cc names.cc -$(here)parser-tab.cc $(here)parser-tab.hh: $(here)parser.y - bison -v -o $(here)parser-tab.cc $< -d +$(d)/parser-tab.cc $(d)/parser-tab.hh: $(d)/parser.y + bison -v -o $(libexpr_DIR)/parser-tab.cc $< -d -$(here)lexer-tab.cc $(here)lexer-tab.hh: $(here)lexer.l - flex --outfile $(here)lexer-tab.cc --header-file=$(here)lexer-tab.hh $< +$(d)/lexer-tab.cc $(d)/lexer-tab.hh: $(d)/lexer.l + flex --outfile $(libexpr_DIR)/lexer-tab.cc --header-file=$(libexpr_DIR)/lexer-tab.hh $< diff --git a/src/libmain/Makefile.new b/src/libmain/Makefile.new index 1f74cea9c9..b198d78422 100644 --- a/src/libmain/Makefile.new +++ b/src/libmain/Makefile.new @@ -1,6 +1,6 @@ LIBS += libmain -libmain_DIR := $(here) +libmain_DIR := $(d) libmain_SOURCES = shared.cc stack.cc diff --git a/src/libstore/Makefile.new b/src/libstore/Makefile.new index 7b08af047e..2eb34b7b42 100644 --- a/src/libstore/Makefile.new +++ b/src/libstore/Makefile.new @@ -1,6 +1,6 @@ LIBS += libstore -libstore_DIR := $(here) +libstore_DIR := $(d) libstore_SOURCES = \ store-api.cc local-store.cc remote-store.cc derivations.cc build.cc misc.cc \ diff --git a/src/libutil/Makefile.new b/src/libutil/Makefile.new index b90c1c0cab..88d43f0aeb 100644 --- a/src/libutil/Makefile.new +++ b/src/libutil/Makefile.new @@ -1,10 +1,11 @@ LIBS += libutil -libutil_DIR := $(here) +libutil_DIR := $(d) -libutil_SOURCES = util.cc hash.cc serialise.cc archive.cc xml-writer.cc affinity.cc \ - md5.c sha1.c sha256.c +libutil_SOURCES = util.cc hash.cc serialise.cc archive.cc xml-writer.cc affinity.cc -# FIXME: md5.c et al. should only be built when we don't have OpenSSL. +ifneq ($(HAVE_OPENSSL), 1) +libutil_SOURCES += md5.c sha1.c sha256.c +endif libutil_LIBS = src/boost/format/libformat diff --git a/src/nix-daemon/Makefile.new b/src/nix-daemon/Makefile.new index a2d98e7905..2a8a7d92cd 100644 --- a/src/nix-daemon/Makefile.new +++ b/src/nix-daemon/Makefile.new @@ -1,6 +1,6 @@ PROGRAMS += nix-daemon -nix-daemon_DIR := $(here) +nix-daemon_DIR := $(d) nix-daemon_SOURCES = nix-daemon.cc diff --git a/src/nix-env/Makefile.new b/src/nix-env/Makefile.new index 5c92274f3c..303af603af 100644 --- a/src/nix-env/Makefile.new +++ b/src/nix-env/Makefile.new @@ -1,6 +1,6 @@ PROGRAMS += nix-env -nix-env_DIR := $(here) +nix-env_DIR := $(d) nix-env_SOURCES = nix-env.cc profiles.cc profiles.hh user-env.cc user-env.hh diff --git a/src/nix-hash/Makefile.new b/src/nix-hash/Makefile.new index 87aba716cb..462cd78d8c 100644 --- a/src/nix-hash/Makefile.new +++ b/src/nix-hash/Makefile.new @@ -1,6 +1,6 @@ PROGRAMS += nix-hash -nix-hash_DIR := $(here) +nix-hash_DIR := $(d) nix-hash_SOURCES = nix-hash.cc diff --git a/src/nix-instantiate/Makefile.new b/src/nix-instantiate/Makefile.new index 71e40706ae..9c4cfec287 100644 --- a/src/nix-instantiate/Makefile.new +++ b/src/nix-instantiate/Makefile.new @@ -1,6 +1,6 @@ PROGRAMS += nix-instantiate -nix-instantiate_DIR := $(here) +nix-instantiate_DIR := $(d) nix-instantiate_SOURCES = nix-instantiate.cc diff --git a/src/nix-store/Makefile.new b/src/nix-store/Makefile.new index 195d05a2d6..0b31f3a367 100644 --- a/src/nix-store/Makefile.new +++ b/src/nix-store/Makefile.new @@ -1,6 +1,6 @@ PROGRAMS += nix-store -nix-store_DIR := $(here) +nix-store_DIR := $(d) nix-store_SOURCES = nix-store.cc dotgraph.cc xmlgraph.cc From 6b5f89f2cf954cae1623a6cd3a8f7eb78e19e85b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 22 Nov 2013 19:30:24 +0000 Subject: [PATCH 11/89] Drop the dependency on Automake --- Makefile.config.in | 2 ++ Makefile.lib | 13 +++++++------ configure.ac | 12 ++++-------- src/libstore/Makefile.new | 2 +- src/libstore/globals.cc | 2 +- src/libutil/Makefile.new | 4 +++- 6 files changed, 18 insertions(+), 17 deletions(-) diff --git a/Makefile.config.in b/Makefile.config.in index e5a6f4c68d..45fb74c911 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -2,6 +2,8 @@ CC = @CC@ CFLAGS = @CFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ +HAVE_OPENSSL = @HAVE_OPENSSL@ +OPENSSL_LIBS = @OPENSSL_LIBS@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ bindir = @bindir@ diff --git a/Makefile.lib b/Makefile.lib index f2eea7ac81..6c59c75969 100644 --- a/Makefile.lib +++ b/Makefile.lib @@ -1,6 +1,13 @@ default: all +# Include Autoconf variables. +Makefile.config: Makefile.config.in + ./config.status + +include Makefile.config + + # Include all sub-Makefiles. define include_sub_makefile = d := $$(patsubst %/, %, $$(dir $(1))) @@ -10,12 +17,6 @@ endef $(foreach mf, $(SUBS), $(eval $(call include_sub_makefile, $(mf)))) -# Include Autoconf variables. -Makefile.config: Makefile.config.in - ./config.status - -include Makefile.config - clean_list := dist_files := diff --git a/configure.ac b/configure.ac index c64766a2d2..5ecf2d9529 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,6 @@ AC_INIT(nix, m4_esyscmd([echo -n $(cat ./version)$VERSION_SUFFIX])) AC_CONFIG_SRCDIR(README) AC_CONFIG_AUX_DIR(config) -AM_INIT_AUTOMAKE([dist-bzip2 foreign]) - -AC_DEFINE_UNQUOTED(NIX_VERSION, ["$VERSION"], [Nix version.]) AC_PROG_SED @@ -252,8 +249,8 @@ AC_DEFINE_UNQUOTED(OPENSSL_PATH, ["$openssl_prog"], [Path of the OpenSSL binary] PKG_CHECK_MODULES([OPENSSL], [libcrypto], [AC_DEFINE([HAVE_OPENSSL], [1], [Whether to use OpenSSL.]) CXXFLAGS="$OPENSSL_CFLAGS $CXXFLAGS" - have_openssl=1], [true]) -AM_CONDITIONAL(HAVE_OPENSSL, test "$have_openssl" = 1) + have_openssl=1], [have_openssl=]) +AC_SUBST(HAVE_OPENSSL, [$have_openssl]) # Look for libbz2, a required dependency. @@ -319,7 +316,6 @@ if test "$enable_shared" = no; then # Perl bindings require shared libraries. perlbindings=no fi -AM_CONDITIONAL(PERL_BINDINGS, test "$perlbindings" = "yes") AC_SUBST(perlbindings) AC_MSG_RESULT($perlbindings) @@ -327,7 +323,7 @@ AC_MSG_RESULT($perlbindings) AC_ARG_ENABLE(init-state, AC_HELP_STRING([--disable-init-state], [do not initialise DB etc. in `make install']), init_state=$enableval, init_state=yes) -AM_CONDITIONAL(INIT_STATE, test "$init_state" = "yes") +#AM_CONDITIONAL(INIT_STATE, test "$init_state" = "yes") # Setuid installations. @@ -361,7 +357,7 @@ fi AC_SUBST(tarFlags) -AM_CONFIG_HEADER([config.h]) +AC_CONFIG_HEADER([config.h]) AC_CONFIG_FILES([Makefile src/Makefile src/boost/Makefile diff --git a/src/libstore/Makefile.new b/src/libstore/Makefile.new index 2eb34b7b42..0a384e0b1d 100644 --- a/src/libstore/Makefile.new +++ b/src/libstore/Makefile.new @@ -16,4 +16,4 @@ libstore_CXXFLAGS = \ -DNIX_CONF_DIR=\"$(sysconfdir)/nix\" \ -DNIX_LIBEXEC_DIR=\"$(libexecdir)\" \ -DNIX_BIN_DIR=\"$(bindir)\" \ - -DNIX_VERSION=\"$(PACKAGE_VERSION)\" + -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc index 1ecc629cb5..68add1982f 100644 --- a/src/libstore/globals.cc +++ b/src/libstore/globals.cc @@ -212,7 +212,7 @@ Settings::SettingsMap Settings::getOverrides() } -const string nixVersion = NIX_VERSION; +const string nixVersion = PACKAGE_VERSION; } diff --git a/src/libutil/Makefile.new b/src/libutil/Makefile.new index 88d43f0aeb..7871a4ddb8 100644 --- a/src/libutil/Makefile.new +++ b/src/libutil/Makefile.new @@ -4,7 +4,9 @@ libutil_DIR := $(d) libutil_SOURCES = util.cc hash.cc serialise.cc archive.cc xml-writer.cc affinity.cc -ifneq ($(HAVE_OPENSSL), 1) +ifeq ($(HAVE_OPENSSL), 1) +libutil_LDFLAGS = $(OPENSSL_LIBS) +else libutil_SOURCES += md5.c sha1.c sha256.c endif From ea2f7df5fac0b319b82a4a33ba8b992737fa8c56 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 22 Nov 2013 20:38:30 +0100 Subject: [PATCH 12/89] Introduce variables GLOBAL_CFLAGS and GLOBAL_CXXFLAGS There are flags that must be set, so they shouldn't be overriden by the user's CFLAGS or CXXFLAGS. --- Makefile.lib | 4 ++-- Makefile.new | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile.lib b/Makefile.lib index 6c59c75969..4df40c9d2c 100644 --- a/Makefile.lib +++ b/Makefile.lib @@ -24,10 +24,10 @@ dist_files := QUIET = @ %.o: %.cc - $(QUIET) $(CXX) -o $@ -c $< -g -fPIC $(CXXFLAGS) $($@_CXXFLAGS) -MMD -MF $(basename $@).dep -MP + $(QUIET) $(CXX) -o $@ -c $< -g -fPIC $(GLOBAL_CXXFLAGS) $(CXXFLAGS) $($@_CXXFLAGS) -MMD -MF $(basename $@).dep -MP %.o: %.c - $(QUIET) $(CC) -o $@ -c $< -g -fPIC $(CFLAGS) $($@_CFLAGS) -MMD -MF $(basename $@).dep -MP + $(QUIET) $(CC) -o $@ -c $< -g -fPIC $(GLOBAL_CFLAGS) $(CFLAGS) $($@_CFLAGS) -MMD -MF $(basename $@).dep -MP # Generate Make rules for libraries. diff --git a/Makefile.new b/Makefile.new index af2c4cec3c..1ae88d42fe 100644 --- a/Makefile.new +++ b/Makefile.new @@ -10,6 +10,7 @@ SUBS = \ src/nix-env/Makefile.new \ src/nix-daemon/Makefile.new +GLOBAL_CXXFLAGS = -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr + include Makefile.lib -CXXFLAGS += -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr -O0 From 812b5a30ecc9d8f78b54644b37c5c2c4375555bc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 22 Nov 2013 19:51:18 +0000 Subject: [PATCH 13/89] Add a Makefile variable for enabling debug info --- Makefile.config.in | 1 + Makefile.lib | 25 ++++++++++++++++++++----- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/Makefile.config.in b/Makefile.config.in index 45fb74c911..bfe3deab9a 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -1,3 +1,4 @@ +BUILD_DEBUG = 1 CC = @CC@ CFLAGS = @CFLAGS@ CXX = @CXX@ diff --git a/Makefile.lib b/Makefile.lib index 4df40c9d2c..b045534dcc 100644 --- a/Makefile.lib +++ b/Makefile.lib @@ -17,17 +17,33 @@ endef $(foreach mf, $(SUBS), $(eval $(call include_sub_makefile, $(mf)))) +# Initialise some variables. clean_list := dist_files := - - QUIET = @ + +# Pass -fPIC if we're building dynamic libraries. +ifeq ($(BUILD_SHARED_LIBS), 1) +GLOBAL_CFLAGS += -fPIC +GLOBAL_CXXFLAGS += -fPIC +endif + + +# Pass -g if we want debug info. +ifeq ($(BUILD_DEBUG), 1) +GLOBAL_CFLAGS += -g +GLOBAL_CXXFLAGS += -g +endif + + +# Pattern rules. + %.o: %.cc - $(QUIET) $(CXX) -o $@ -c $< -g -fPIC $(GLOBAL_CXXFLAGS) $(CXXFLAGS) $($@_CXXFLAGS) -MMD -MF $(basename $@).dep -MP + $(QUIET) $(CXX) -o $@ -c $< $(GLOBAL_CXXFLAGS) $(CXXFLAGS) $($@_CXXFLAGS) -MMD -MF $(basename $@).dep -MP %.o: %.c - $(QUIET) $(CC) -o $@ -c $< -g -fPIC $(GLOBAL_CFLAGS) $(CFLAGS) $($@_CFLAGS) -MMD -MF $(basename $@).dep -MP + $(QUIET) $(CC) -o $@ -c $< $(GLOBAL_CFLAGS) $(CFLAGS) $($@_CFLAGS) -MMD -MF $(basename $@).dep -MP # Generate Make rules for libraries. @@ -91,7 +107,6 @@ dist: # Cleaning stuff. - clean: rm -fv $(clean_list) From 9b11a8bfbcfd9e6f40ae8b573d4de492a23b91b9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 22 Nov 2013 20:05:00 +0000 Subject: [PATCH 14/89] Fix building without Boehm GC --- Makefile.config.in | 1 + src/libmain/Makefile.new | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.config.in b/Makefile.config.in index bfe3deab9a..ed38e2980b 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -1,3 +1,4 @@ +BDW_GC_LIBS = @BDW_GC_LIBS@ BUILD_DEBUG = 1 CC = @CC@ CFLAGS = @CFLAGS@ diff --git a/src/libmain/Makefile.new b/src/libmain/Makefile.new index b198d78422..9e26aa8b9e 100644 --- a/src/libmain/Makefile.new +++ b/src/libmain/Makefile.new @@ -4,4 +4,4 @@ libmain_DIR := $(d) libmain_SOURCES = shared.cc stack.cc -libmain_LDFLAGS = -lgc +libmain_LDFLAGS = $(BDW_GC_LIBS) From 6dd74b48f8d587fcc215e9f4721eacace7f8f462 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 22 Nov 2013 20:56:58 +0000 Subject: [PATCH 15/89] Support building dynamic libraries --- Makefile.lib | 28 ++++++++++++++++++---------- src/libmain/Makefile.new | 2 +- src/libutil/Makefile.new | 4 ++-- src/nix-store/Makefile.new | 2 ++ 4 files changed, 23 insertions(+), 13 deletions(-) diff --git a/Makefile.lib b/Makefile.lib index b045534dcc..3ebb8df7c9 100644 --- a/Makefile.lib +++ b/Makefile.lib @@ -25,15 +25,15 @@ QUIET = @ # Pass -fPIC if we're building dynamic libraries. ifeq ($(BUILD_SHARED_LIBS), 1) -GLOBAL_CFLAGS += -fPIC -GLOBAL_CXXFLAGS += -fPIC + GLOBAL_CFLAGS += -fPIC + GLOBAL_CXXFLAGS += -fPIC endif # Pass -g if we want debug info. ifeq ($(BUILD_DEBUG), 1) -GLOBAL_CFLAGS += -g -GLOBAL_CXXFLAGS += -g + GLOBAL_CFLAGS += -g + GLOBAL_CXXFLAGS += -g endif @@ -53,11 +53,19 @@ define LIBS_template = _d := $$($(1)_DIR) _srcs := $$(foreach src, $$($(1)_SOURCES), $$(_d)/$$(src)) _objs := $$(addsuffix .o, $$(basename $$(_srcs))) - _libs := $$(foreach lib, $$($(1)_LIBS), $$(lib).a) - _lib := $$(_d)/$(1).a - $$(_lib): $$(_objs) + ifeq ($(BUILD_SHARED_LIBS), 1) + _lib := $$(_d)/$(1).so + $$(_lib): $$(_objs) + $(QUIET) $(CC) -o $$@ -shared $$^ $$($(1)_LDFLAGS) + else + _lib := $$(_d)/$(1).a + $$(_lib): $$(_objs) $(QUIET) ar crs $$@ $$? + $(1)_LDFLAGS_PROPAGATED += $$($(1)_LDFLAGS) + endif + + $(1)_NAME := $$(_lib) # Propagate CXXFLAGS to the individual object files. $$(foreach obj, $$(_objs), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS))) @@ -65,7 +73,7 @@ define LIBS_template = include $$(wildcard $$(_d)/*.dep) libs_list += $$(_lib) - clean_list += $$(_d)/*.a $$(_d)/*.o $$(_d)/*.dep + clean_list += $$(_d)/*.a $$(_d)/*.so $$(_d)/*.o $$(_d)/*.dep dist_files += $$(_srcs) endef @@ -79,11 +87,11 @@ define PROGRAMS_template = _d := $$($(1)_DIR) _srcs := $$(foreach src, $$($(1)_SOURCES), $$(_d)/$$(src)) _objs := $$(addsuffix .o, $$(basename $$(_srcs))) - _libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_DIR)/$$(lib).a) + _libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_NAME)) _prog := $$(_d)/$(1) $$(_prog): $$(_objs) $$(_libs) - $(QUIET) g++ -o $$@ $$^ $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS)) + $(QUIET) $(CXX) -o $$@ -Wl,--no-copy-dt-needed-entries $$^ $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_PROPAGATED)) # Propagate CXXFLAGS to the individual object files. $$(foreach obj, $$(_objs), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS))) diff --git a/src/libmain/Makefile.new b/src/libmain/Makefile.new index 9e26aa8b9e..eed7e84afe 100644 --- a/src/libmain/Makefile.new +++ b/src/libmain/Makefile.new @@ -4,4 +4,4 @@ libmain_DIR := $(d) libmain_SOURCES = shared.cc stack.cc -libmain_LDFLAGS = $(BDW_GC_LIBS) +libmain_LDFLAGS_PROPAGATED = $(BDW_GC_LIBS) diff --git a/src/libutil/Makefile.new b/src/libutil/Makefile.new index 7871a4ddb8..b7dbf7d1d2 100644 --- a/src/libutil/Makefile.new +++ b/src/libutil/Makefile.new @@ -5,9 +5,9 @@ libutil_DIR := $(d) libutil_SOURCES = util.cc hash.cc serialise.cc archive.cc xml-writer.cc affinity.cc ifeq ($(HAVE_OPENSSL), 1) -libutil_LDFLAGS = $(OPENSSL_LIBS) + libutil_LDFLAGS = $(OPENSSL_LIBS) else -libutil_SOURCES += md5.c sha1.c sha256.c + libutil_SOURCES += md5.c sha1.c sha256.c endif libutil_LIBS = src/boost/format/libformat diff --git a/src/nix-store/Makefile.new b/src/nix-store/Makefile.new index 0b31f3a367..105513872e 100644 --- a/src/nix-store/Makefile.new +++ b/src/nix-store/Makefile.new @@ -5,3 +5,5 @@ nix-store_DIR := $(d) nix-store_SOURCES = nix-store.cc dotgraph.cc xmlgraph.cc nix-store_LIBS = libmain libstore libutil libformat + +nix-store_LDFLAGS = -lbz2 From d1b3ca0b4a57f48f94a555c97f6a555c3a1f3639 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 23 Nov 2013 17:20:15 +0100 Subject: [PATCH 16/89] Improve building dynamic libraries They now get a correct RPATH. --- Makefile.lib | 16 ++++++++++------ src/nix-env/Makefile.new | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Makefile.lib b/Makefile.lib index 3ebb8df7c9..d197fa6c1c 100644 --- a/Makefile.lib +++ b/Makefile.lib @@ -50,21 +50,25 @@ endif libs_list := define LIBS_template = - _d := $$($(1)_DIR) + _d := $$(strip $$($(1)_DIR)) _srcs := $$(foreach src, $$($(1)_SOURCES), $$(_d)/$$(src)) _objs := $$(addsuffix .o, $$(basename $$(_srcs))) + $(1)_LDFLAGS_USE := + ifeq ($(BUILD_SHARED_LIBS), 1) _lib := $$(_d)/$(1).so $$(_lib): $$(_objs) $(QUIET) $(CC) -o $$@ -shared $$^ $$($(1)_LDFLAGS) + $(1)_LDFLAGS_USE += -L$$(_d) -Wl,-rpath,$$(abspath $$(_d)) -l$$(patsubst lib%,%,$$(strip $(1))) else _lib := $$(_d)/$(1).a $$(_lib): $$(_objs) $(QUIET) ar crs $$@ $$? - $(1)_LDFLAGS_PROPAGATED += $$($(1)_LDFLAGS) + $(1)_LDFLAGS_USE += $$(_lib) $$($(1)_LDFLAGS) endif + $(1)_LDFLAGS_USE += $$($(1)_LDFLAGS_PROPAGATED) $(1)_NAME := $$(_lib) # Propagate CXXFLAGS to the individual object files. @@ -86,15 +90,15 @@ programs_list := define PROGRAMS_template = _d := $$($(1)_DIR) _srcs := $$(foreach src, $$($(1)_SOURCES), $$(_d)/$$(src)) - _objs := $$(addsuffix .o, $$(basename $$(_srcs))) + $(1)_OBJS := $$(addsuffix .o, $$(basename $$(_srcs))) _libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_NAME)) _prog := $$(_d)/$(1) - $$(_prog): $$(_objs) $$(_libs) - $(QUIET) $(CXX) -o $$@ -Wl,--no-copy-dt-needed-entries $$^ $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_PROPAGATED)) + $$(_prog): $$($(1)_OBJS) $$(_libs) + $(QUIET) $(CXX) -o $$@ -Wl,--no-copy-dt-needed-entries $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) # Propagate CXXFLAGS to the individual object files. - $$(foreach obj, $$(_objs), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS))) + $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS))) include $$(wildcard $$(_d)/*.dep) diff --git a/src/nix-env/Makefile.new b/src/nix-env/Makefile.new index 303af603af..04545231ca 100644 --- a/src/nix-env/Makefile.new +++ b/src/nix-env/Makefile.new @@ -2,6 +2,6 @@ PROGRAMS += nix-env nix-env_DIR := $(d) -nix-env_SOURCES = nix-env.cc profiles.cc profiles.hh user-env.cc user-env.hh +nix-env_SOURCES = nix-env.cc profiles.cc user-env.cc nix-env_LIBS = libexpr libmain libstore libutil libformat From 611868a90904ac233d8476682a4618fdd8c78c50 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 23 Nov 2013 17:04:27 +0000 Subject: [PATCH 17/89] =?UTF-8?q?Implement=20basic=20=E2=80=98make=20insta?= =?UTF-8?q?ll=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile.lib | 12 ++++++++++-- Makefile.new | 3 ++- src/libexpr/primops.cc | 1 + 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Makefile.lib b/Makefile.lib index d197fa6c1c..1c4ada9c2e 100644 --- a/Makefile.lib +++ b/Makefile.lib @@ -92,11 +92,19 @@ define PROGRAMS_template = _srcs := $$(foreach src, $$($(1)_SOURCES), $$(_d)/$$(src)) $(1)_OBJS := $$(addsuffix .o, $$(basename $$(_srcs))) _libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_NAME)) - _prog := $$(_d)/$(1) + $(1)_PATH := $$(_d)/$(1) - $$(_prog): $$($(1)_OBJS) $$(_libs) + $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) $(QUIET) $(CXX) -o $$@ -Wl,--no-copy-dt-needed-entries $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) + $(1)_INSTALL_PATH := $$(bindir)/$(1) + + $$($(1)_INSTALL_PATH): $$($(1)_PATH) + mkdir -p $$(dir $$@) + cp $$< $$@ + + install:: $$($(1)_INSTALL_PATH) + # Propagate CXXFLAGS to the individual object files. $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS))) diff --git a/Makefile.new b/Makefile.new index 1ae88d42fe..646f438480 100644 --- a/Makefile.new +++ b/Makefile.new @@ -8,7 +8,8 @@ SUBS = \ src/nix-store/Makefile.new \ src/nix-instantiate/Makefile.new \ src/nix-env/Makefile.new \ - src/nix-daemon/Makefile.new + src/nix-daemon/Makefile.new \ + corepkgs/Makefile.new GLOBAL_CXXFLAGS = -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index 9c9d202eda..bb6739d205 100644 --- a/src/libexpr/primops.cc +++ b/src/libexpr/primops.cc @@ -1322,6 +1322,7 @@ void EvalState::createBaseEnv() /* Add a wrapper around the derivation primop that computes the `drvPath' and `outPath' attributes lazily. */ string path = findFile("nix/derivation.nix"); + assert(!path.empty()); sDerivationNix = symbols.create(path); evalFile(path, v); addConstant("derivation", v); From 14772783e66a6e67726872926834c0e9f7210e6d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 23 Nov 2013 20:32:20 +0100 Subject: [PATCH 18/89] Support installation of dynamically linked programs Here we need to re-link programs so that their RPATH refers to the installed libraries. --- Makefile.config.in | 2 ++ Makefile.lib | 42 +++++++++++++++++++++++++++++++++++++----- 2 files changed, 39 insertions(+), 5 deletions(-) diff --git a/Makefile.config.in b/Makefile.config.in index ed38e2980b..48baa28894 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -12,8 +12,10 @@ bindir = @bindir@ datadir = @datadir@ datarootdir = @datarootdir@ exec_prefix = @exec_prefix@ +libdir = @libdir@ libexecdir = @libexecdir@ localstatedir = @localstatedir@ +pkglibdir = $(libdir)/$(PACKAGE_NAME) prefix = @prefix@ storedir = @storedir@ sysconfdir = @sysconfdir@ diff --git a/Makefile.lib b/Makefile.lib index 1c4ada9c2e..0a2fcccadc 100644 --- a/Makefile.lib +++ b/Makefile.lib @@ -55,20 +55,40 @@ define LIBS_template = _objs := $$(addsuffix .o, $$(basename $$(_srcs))) $(1)_LDFLAGS_USE := + $(1)_LDFLAGS_USE_INSTALLED := ifeq ($(BUILD_SHARED_LIBS), 1) + _lib := $$(_d)/$(1).so $$(_lib): $$(_objs) $(QUIET) $(CC) -o $$@ -shared $$^ $$($(1)_LDFLAGS) + $(1)_LDFLAGS_USE += -L$$(_d) -Wl,-rpath,$$(abspath $$(_d)) -l$$(patsubst lib%,%,$$(strip $(1))) + + $(1)_INSTALL_DIR := $$(pkglibdir) + + $(1)_INSTALL_PATH := $$($(1)_INSTALL_DIR)/$(1).so + + $$($(1)_INSTALL_PATH): $$(_objs) + install -d $$($(1)_INSTALL_DIR) + $(QUIET) $(CC) -o $$@ -shared $$^ $$($(1)_LDFLAGS) + + $(1)_LDFLAGS_USE_INSTALLED += -L$$($(1)_INSTALL_DIR) -Wl,-rpath,$$($(1)_INSTALL_DIR) -l$$(patsubst lib%,%,$$(strip $(1))) + else + _lib := $$(_d)/$(1).a $$(_lib): $$(_objs) $(QUIET) ar crs $$@ $$? + $(1)_LDFLAGS_USE += $$(_lib) $$($(1)_LDFLAGS) + + $(1)_INSTALL_PATH := $$(pkglibdir)/$(1).a + endif $(1)_LDFLAGS_USE += $$($(1)_LDFLAGS_PROPAGATED) + $(1)_LDFLAGS_USE_INSTALLED += $$($(1)_LDFLAGS_PROPAGATED) $(1)_NAME := $$(_lib) # Propagate CXXFLAGS to the individual object files. @@ -99,19 +119,31 @@ define PROGRAMS_template = $(1)_INSTALL_PATH := $$(bindir)/$(1) - $$($(1)_INSTALL_PATH): $$($(1)_PATH) - mkdir -p $$(dir $$@) + install:: $$($(1)_INSTALL_PATH) + + ifeq ($(BUILD_SHARED_LIBS), 1) + + _libs_final := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_INSTALL_PATH)) + + $$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) + install -d $$(dir $$($(1)_INSTALL_PATH)) + $(QUIET) $(CXX) -o $$($(1)_INSTALL_PATH) -Wl,--no-copy-dt-needed-entries $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) + + else + + $$($(1)_INSTALL_PATH): $$($(1)_PATH) + install -d $$(dir $$($(1)_INSTALL_PATH)) cp $$< $$@ - install:: $$($(1)_INSTALL_PATH) + endif # Propagate CXXFLAGS to the individual object files. $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS))) include $$(wildcard $$(_d)/*.dep) - programs_list += $$(_prog) - clean_list += $$(_prog) $$(_d)/*.o $$(_d)/*.dep + programs_list += $$($(1)_PATH) + clean_list += $$($(1)_PATH) $$(_d)/*.o $$(_d)/*.dep dist_files += $$(_srcs) endef From 90dfb37f147941e5edf262c27e269cdfd1e8dcfb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 23 Nov 2013 20:11:02 +0000 Subject: [PATCH 19/89] Allow (dynamic) libraries to depend on other libraries --- Makefile.lib | 17 ++++++++++------- src/libexpr/Makefile.new | 2 ++ src/libmain/Makefile.new | 2 ++ src/libstore/Makefile.new | 2 ++ src/libutil/Makefile.new | 2 +- 5 files changed, 17 insertions(+), 8 deletions(-) diff --git a/Makefile.lib b/Makefile.lib index 0a2fcccadc..612550e921 100644 --- a/Makefile.lib +++ b/Makefile.lib @@ -52,7 +52,8 @@ libs_list := define LIBS_template = _d := $$(strip $$($(1)_DIR)) _srcs := $$(foreach src, $$($(1)_SOURCES), $$(_d)/$$(src)) - _objs := $$(addsuffix .o, $$(basename $$(_srcs))) + $(1)_OBJS := $$(addsuffix .o, $$(basename $$(_srcs))) + _libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_NAME)) $(1)_LDFLAGS_USE := $(1)_LDFLAGS_USE_INSTALLED := @@ -60,8 +61,8 @@ define LIBS_template = ifeq ($(BUILD_SHARED_LIBS), 1) _lib := $$(_d)/$(1).so - $$(_lib): $$(_objs) - $(QUIET) $(CC) -o $$@ -shared $$^ $$($(1)_LDFLAGS) + $$(_lib): $$($(1)_OBJS) $$(_libs) + $(QUIET) $(CC) -o $$@ -shared -Wl,--no-copy-dt-needed-entries $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) $(1)_LDFLAGS_USE += -L$$(_d) -Wl,-rpath,$$(abspath $$(_d)) -l$$(patsubst lib%,%,$$(strip $(1))) @@ -69,16 +70,18 @@ define LIBS_template = $(1)_INSTALL_PATH := $$($(1)_INSTALL_DIR)/$(1).so - $$($(1)_INSTALL_PATH): $$(_objs) + _libs_final := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_INSTALL_PATH)) + + $$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) install -d $$($(1)_INSTALL_DIR) - $(QUIET) $(CC) -o $$@ -shared $$^ $$($(1)_LDFLAGS) + $(QUIET) $(CC) -o $$@ -shared -Wl,--no-copy-dt-needed-entries $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) $(1)_LDFLAGS_USE_INSTALLED += -L$$($(1)_INSTALL_DIR) -Wl,-rpath,$$($(1)_INSTALL_DIR) -l$$(patsubst lib%,%,$$(strip $(1))) else _lib := $$(_d)/$(1).a - $$(_lib): $$(_objs) + $$(_lib): $$($(1)_OBJS) $(QUIET) ar crs $$@ $$? $(1)_LDFLAGS_USE += $$(_lib) $$($(1)_LDFLAGS) @@ -92,7 +95,7 @@ define LIBS_template = $(1)_NAME := $$(_lib) # Propagate CXXFLAGS to the individual object files. - $$(foreach obj, $$(_objs), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS))) + $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS))) include $$(wildcard $$(_d)/*.dep) diff --git a/src/libexpr/Makefile.new b/src/libexpr/Makefile.new index 3fd4fc7b21..ded112107f 100644 --- a/src/libexpr/Makefile.new +++ b/src/libexpr/Makefile.new @@ -7,6 +7,8 @@ libexpr_SOURCES = \ get-drvs.cc attr-path.cc value-to-xml.cc value-to-json.cc \ common-opts.cc names.cc +libexpr_LIBS = libutil libstore libformat + $(d)/parser-tab.cc $(d)/parser-tab.hh: $(d)/parser.y bison -v -o $(libexpr_DIR)/parser-tab.cc $< -d diff --git a/src/libmain/Makefile.new b/src/libmain/Makefile.new index eed7e84afe..86323dbd48 100644 --- a/src/libmain/Makefile.new +++ b/src/libmain/Makefile.new @@ -4,4 +4,6 @@ libmain_DIR := $(d) libmain_SOURCES = shared.cc stack.cc +libmain_LIBS = libstore libutil libformat + libmain_LDFLAGS_PROPAGATED = $(BDW_GC_LIBS) diff --git a/src/libstore/Makefile.new b/src/libstore/Makefile.new index 0a384e0b1d..7d542d3123 100644 --- a/src/libstore/Makefile.new +++ b/src/libstore/Makefile.new @@ -6,6 +6,8 @@ libstore_SOURCES = \ store-api.cc local-store.cc remote-store.cc derivations.cc build.cc misc.cc \ globals.cc references.cc pathlocks.cc gc.cc optimise-store.cc +libstore_LIBS = libutil libformat + libstore_LDFLAGS = -lsqlite3 -lbz2 libstore_CXXFLAGS = \ diff --git a/src/libutil/Makefile.new b/src/libutil/Makefile.new index b7dbf7d1d2..59670d2ce0 100644 --- a/src/libutil/Makefile.new +++ b/src/libutil/Makefile.new @@ -10,4 +10,4 @@ else libutil_SOURCES += md5.c sha1.c sha256.c endif -libutil_LIBS = src/boost/format/libformat +libutil_LIBS = libformat From 06a8ac96e79547c092debfe3b93d78bcb862edc2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 23 Nov 2013 20:15:57 +0000 Subject: [PATCH 20/89] Initialise Boehm GC only once --- src/libexpr/eval.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc index 3db4bb66f4..e4a0d7fd2b 100644 --- a/src/libexpr/eval.cc +++ b/src/libexpr/eval.cc @@ -156,8 +156,8 @@ EvalState::EvalState() countCalls = getEnv("NIX_COUNT_CALLS", "0") != "0"; #if HAVE_BOEHMGC - static bool gcInitialised = true; - if (gcInitialised) { + static bool gcInitialised = false; + if (!gcInitialised) { /* Set the initial heap size to something fairly big (25% of physical RAM, up to a maximum of 384 MiB) so that in most cases we don't need to garbage collect at all. (Collection From 5a1114ecdbbd115ec8aeb1a98326d793ff3e8058 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 23 Nov 2013 20:19:36 +0000 Subject: [PATCH 21/89] 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. --- src/libexpr/Makefile.new | 5 +++++ src/libexpr/eval.cc | 17 +++++++++++++++++ src/libmain/Makefile.new | 2 -- src/libmain/shared.cc | 20 -------------------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/libexpr/Makefile.new b/src/libexpr/Makefile.new index ded112107f..cbae11c53c 100644 --- a/src/libexpr/Makefile.new +++ b/src/libexpr/Makefile.new @@ -9,6 +9,11 @@ libexpr_SOURCES = \ libexpr_LIBS = libutil libstore libformat +# 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) + $(d)/parser-tab.cc $(d)/parser-tab.hh: $(d)/parser.y bison -v -o $(libexpr_DIR)/parser-tab.cc $< -d diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc index e4a0d7fd2b..12c6aa8dcd 100644 --- a/src/libexpr/eval.cc +++ b/src/libexpr/eval.cc @@ -129,6 +129,14 @@ string showType(const Value & v) } +/* Called when the Boehm GC runs out of memory. */ +static void * oomHandler(size_t requested) +{ + /* Convert this to a proper C++ exception. */ + throw std::bad_alloc(); +} + + EvalState::EvalState() : sWith(symbols.create("")) , sOutPath(symbols.create("outPath")) @@ -158,6 +166,14 @@ EvalState::EvalState() #if HAVE_BOEHMGC static bool gcInitialised = false; if (!gcInitialised) { + + /* Initialise the Boehm garbage collector. This isn't + necessary on most platforms, but for portability we do it + anyway. */ + GC_INIT(); + + GC_oom_fn = oomHandler; + /* Set the initial heap size to something fairly big (25% of physical RAM, up to a maximum of 384 MiB) so that in most cases we don't need to garbage collect at all. (Collection @@ -181,6 +197,7 @@ EvalState::EvalState() debug(format("setting initial heap size to %1% bytes") % size); GC_expand_hp(size); } + gcInitialised = true; } #endif diff --git a/src/libmain/Makefile.new b/src/libmain/Makefile.new index 86323dbd48..6ca49d5838 100644 --- a/src/libmain/Makefile.new +++ b/src/libmain/Makefile.new @@ -5,5 +5,3 @@ libmain_DIR := $(d) libmain_SOURCES = shared.cc stack.cc libmain_LIBS = libstore libutil libformat - -libmain_LDFLAGS_PROPAGATED = $(BDW_GC_LIBS) diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc index b0b69f7f61..8df2a7f52a 100644 --- a/src/libmain/shared.cc +++ b/src/libmain/shared.cc @@ -15,10 +15,6 @@ #include #include -#if HAVE_BOEHMGC -#include -#endif - namespace nix { @@ -231,14 +227,6 @@ static void initAndRun(int argc, char * * argv) } -/* Called when the Boehm GC runs out of memory. */ -static void * oomHandler(size_t requested) -{ - /* Convert this to a proper C++ exception. */ - throw std::bad_alloc(); -} - - void showManPage(const string & name) { string cmd = "man " + name; @@ -268,14 +256,6 @@ int main(int argc, char * * argv) std::ios::sync_with_stdio(false); -#if HAVE_BOEHMGC - /* Initialise the Boehm garbage collector. This isn't necessary - on most platforms, but for portability we do it anyway. */ - GC_INIT(); - - GC_oom_fn = oomHandler; -#endif - try { try { initAndRun(argc, argv); From c1f3a1a89b717e73c2a8c2315067c495e246457c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 24 Nov 2013 00:10:00 +0100 Subject: [PATCH 22/89] Disallow undefined symbols in dynamic libraries by default This encourages that each library declares its own dependencies properly. --- Makefile.lib | 14 ++++++++++---- src/libmain/Makefile.new | 2 ++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Makefile.lib b/Makefile.lib index 612550e921..f5872c88ba 100644 --- a/Makefile.lib +++ b/Makefile.lib @@ -27,6 +27,7 @@ QUIET = @ ifeq ($(BUILD_SHARED_LIBS), 1) GLOBAL_CFLAGS += -fPIC GLOBAL_CXXFLAGS += -fPIC + GLOBAL_LDFLAGS += -Wl,--no-copy-dt-needed-entries endif @@ -60,9 +61,13 @@ define LIBS_template = ifeq ($(BUILD_SHARED_LIBS), 1) + ifndef $(1)_ALLOW_UNDEFINED + $(1)_LDFLAGS += -z defs + endif + _lib := $$(_d)/$(1).so $$(_lib): $$($(1)_OBJS) $$(_libs) - $(QUIET) $(CC) -o $$@ -shared -Wl,--no-copy-dt-needed-entries $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) + $(QUIET) $(CXX) -o $$@ -shared $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) $(1)_LDFLAGS_USE += -L$$(_d) -Wl,-rpath,$$(abspath $$(_d)) -l$$(patsubst lib%,%,$$(strip $(1))) @@ -74,7 +79,7 @@ define LIBS_template = $$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) install -d $$($(1)_INSTALL_DIR) - $(QUIET) $(CC) -o $$@ -shared -Wl,--no-copy-dt-needed-entries $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) + $(QUIET) $(CXX) -o $$@ -shared $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) $(1)_LDFLAGS_USE_INSTALLED += -L$$($(1)_INSTALL_DIR) -Wl,-rpath,$$($(1)_INSTALL_DIR) -l$$(patsubst lib%,%,$$(strip $(1))) @@ -92,6 +97,7 @@ define LIBS_template = $(1)_LDFLAGS_USE += $$($(1)_LDFLAGS_PROPAGATED) $(1)_LDFLAGS_USE_INSTALLED += $$($(1)_LDFLAGS_PROPAGATED) + $(1)_NAME := $$(_lib) # Propagate CXXFLAGS to the individual object files. @@ -118,7 +124,7 @@ define PROGRAMS_template = $(1)_PATH := $$(_d)/$(1) $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) - $(QUIET) $(CXX) -o $$@ -Wl,--no-copy-dt-needed-entries $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) + $(QUIET) $(CXX) -o $$@ $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) $(1)_INSTALL_PATH := $$(bindir)/$(1) @@ -130,7 +136,7 @@ define PROGRAMS_template = $$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) install -d $$(dir $$($(1)_INSTALL_PATH)) - $(QUIET) $(CXX) -o $$($(1)_INSTALL_PATH) -Wl,--no-copy-dt-needed-entries $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) + $(QUIET) $(CXX) -o $$($(1)_INSTALL_PATH) $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) else diff --git a/src/libmain/Makefile.new b/src/libmain/Makefile.new index 6ca49d5838..2ead94ca6b 100644 --- a/src/libmain/Makefile.new +++ b/src/libmain/Makefile.new @@ -5,3 +5,5 @@ libmain_DIR := $(d) libmain_SOURCES = shared.cc stack.cc libmain_LIBS = libstore libutil libformat + +libmain_ALLOW_UNDEFINED = 1 From 07c87a8e9ef7bd42995230700169c6a18cf26313 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 24 Nov 2013 00:15:25 +0100 Subject: [PATCH 23/89] Consistent naming --- Makefile.lib | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile.lib b/Makefile.lib index f5872c88ba..16fd20c773 100644 --- a/Makefile.lib +++ b/Makefile.lib @@ -54,7 +54,7 @@ define LIBS_template = _d := $$(strip $$($(1)_DIR)) _srcs := $$(foreach src, $$($(1)_SOURCES), $$(_d)/$$(src)) $(1)_OBJS := $$(addsuffix .o, $$(basename $$(_srcs))) - _libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_NAME)) + _libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_PATH)) $(1)_LDFLAGS_USE := $(1)_LDFLAGS_USE_INSTALLED := @@ -65,8 +65,9 @@ define LIBS_template = $(1)_LDFLAGS += -z defs endif - _lib := $$(_d)/$(1).so - $$(_lib): $$($(1)_OBJS) $$(_libs) + $(1)_PATH := $$(_d)/$(1).so + + $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) $(QUIET) $(CXX) -o $$@ -shared $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) $(1)_LDFLAGS_USE += -L$$(_d) -Wl,-rpath,$$(abspath $$(_d)) -l$$(patsubst lib%,%,$$(strip $(1))) @@ -85,11 +86,12 @@ define LIBS_template = else - _lib := $$(_d)/$(1).a - $$(_lib): $$($(1)_OBJS) + $(1)_PATH := $$(_d)/$(1).a + + $$($(1)_PATH): $$($(1)_OBJS) $(QUIET) ar crs $$@ $$? - $(1)_LDFLAGS_USE += $$(_lib) $$($(1)_LDFLAGS) + $(1)_LDFLAGS_USE += $$($(1)_PATH) $$($(1)_LDFLAGS) $(1)_INSTALL_PATH := $$(pkglibdir)/$(1).a @@ -98,14 +100,12 @@ define LIBS_template = $(1)_LDFLAGS_USE += $$($(1)_LDFLAGS_PROPAGATED) $(1)_LDFLAGS_USE_INSTALLED += $$($(1)_LDFLAGS_PROPAGATED) - $(1)_NAME := $$(_lib) - # Propagate CXXFLAGS to the individual object files. $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS))) include $$(wildcard $$(_d)/*.dep) - libs_list += $$(_lib) + libs_list += $$($(1)_PATH) clean_list += $$(_d)/*.a $$(_d)/*.so $$(_d)/*.o $$(_d)/*.dep dist_files += $$(_srcs) endef @@ -120,7 +120,7 @@ define PROGRAMS_template = _d := $$($(1)_DIR) _srcs := $$(foreach src, $$($(1)_SOURCES), $$(_d)/$$(src)) $(1)_OBJS := $$(addsuffix .o, $$(basename $$(_srcs))) - _libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_NAME)) + _libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_PATH)) $(1)_PATH := $$(_d)/$(1) $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) From abb5bd66dee7afe9560b3a132da42b71d4801274 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 23 Nov 2013 23:42:50 +0000 Subject: [PATCH 24/89] Add Makefile for nix-log2xml --- Makefile.new | 1 + src/nix-log2xml/Makefile.new | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 src/nix-log2xml/Makefile.new diff --git a/Makefile.new b/Makefile.new index 646f438480..e1ed0615c5 100644 --- a/Makefile.new +++ b/Makefile.new @@ -9,6 +9,7 @@ SUBS = \ src/nix-instantiate/Makefile.new \ src/nix-env/Makefile.new \ src/nix-daemon/Makefile.new \ + src/nix-log2xml/Makefile.new \ corepkgs/Makefile.new GLOBAL_CXXFLAGS = -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr diff --git a/src/nix-log2xml/Makefile.new b/src/nix-log2xml/Makefile.new new file mode 100644 index 0000000000..a88f948671 --- /dev/null +++ b/src/nix-log2xml/Makefile.new @@ -0,0 +1,5 @@ +PROGRAMS += nix-log2xml + +nix-log2xml_DIR := $(d) + +nix-log2xml_SOURCES = log2xml.cc From f267ff16b4527ca6c083014b93b4568d89221f49 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 23 Nov 2013 23:49:34 +0000 Subject: [PATCH 25/89] Allow libraries to set an actual name different from the symbolic name --- Makefile.lib | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile.lib b/Makefile.lib index 16fd20c773..38370c2fec 100644 --- a/Makefile.lib +++ b/Makefile.lib @@ -51,6 +51,7 @@ endif libs_list := define LIBS_template = + $(1)_NAME ?= $(1) _d := $$(strip $$($(1)_DIR)) _srcs := $$(foreach src, $$($(1)_SOURCES), $$(_d)/$$(src)) $(1)_OBJS := $$(addsuffix .o, $$(basename $$(_srcs))) @@ -65,16 +66,16 @@ define LIBS_template = $(1)_LDFLAGS += -z defs endif - $(1)_PATH := $$(_d)/$(1).so + $(1)_PATH := $$(_d)/$$($(1)_NAME).so $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) $(QUIET) $(CXX) -o $$@ -shared $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) - $(1)_LDFLAGS_USE += -L$$(_d) -Wl,-rpath,$$(abspath $$(_d)) -l$$(patsubst lib%,%,$$(strip $(1))) + $(1)_LDFLAGS_USE += -L$$(_d) -Wl,-rpath,$$(abspath $$(_d)) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME))) $(1)_INSTALL_DIR := $$(pkglibdir) - $(1)_INSTALL_PATH := $$($(1)_INSTALL_DIR)/$(1).so + $(1)_INSTALL_PATH := $$($(1)_INSTALL_DIR)/$$($(1)_NAME).so _libs_final := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_INSTALL_PATH)) @@ -82,18 +83,18 @@ define LIBS_template = install -d $$($(1)_INSTALL_DIR) $(QUIET) $(CXX) -o $$@ -shared $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) - $(1)_LDFLAGS_USE_INSTALLED += -L$$($(1)_INSTALL_DIR) -Wl,-rpath,$$($(1)_INSTALL_DIR) -l$$(patsubst lib%,%,$$(strip $(1))) + $(1)_LDFLAGS_USE_INSTALLED += -L$$($(1)_INSTALL_DIR) -Wl,-rpath,$$($(1)_INSTALL_DIR) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME))) else - $(1)_PATH := $$(_d)/$(1).a + $(1)_PATH := $$(_d)/$$($(1)_NAME).a $$($(1)_PATH): $$($(1)_OBJS) $(QUIET) ar crs $$@ $$? $(1)_LDFLAGS_USE += $$($(1)_PATH) $$($(1)_LDFLAGS) - $(1)_INSTALL_PATH := $$(pkglibdir)/$(1).a + $(1)_INSTALL_PATH := $$(pkglibdir)/$$($(1)_NAME).a endif From 2bd0fcc9663211cc480f61dc9e05f43ac9ecca69 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 23 Nov 2013 23:53:41 +0000 Subject: [PATCH 26/89] 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). --- src/boost/format/Makefile.new | 2 ++ src/libexpr/Makefile.new | 2 ++ src/libmain/Makefile.new | 2 ++ src/libstore/Makefile.new | 2 ++ src/libutil/Makefile.new | 2 ++ 5 files changed, 10 insertions(+) diff --git a/src/boost/format/Makefile.new b/src/boost/format/Makefile.new index bbc90ca76c..b60a2ea4fb 100644 --- a/src/boost/format/Makefile.new +++ b/src/boost/format/Makefile.new @@ -1,5 +1,7 @@ LIBS += libformat +libformat_NAME = libnixformat + libformat_DIR := $(d) libformat_SOURCES = format_implementation.cc free_funcs.cc parsing.cc diff --git a/src/libexpr/Makefile.new b/src/libexpr/Makefile.new index cbae11c53c..c6ed7d14b9 100644 --- a/src/libexpr/Makefile.new +++ b/src/libexpr/Makefile.new @@ -1,5 +1,7 @@ LIBS += libexpr +libexpr_NAME = libnixexpr + libexpr_DIR := $(d) libexpr_SOURCES = \ diff --git a/src/libmain/Makefile.new b/src/libmain/Makefile.new index 2ead94ca6b..7312b8d2cd 100644 --- a/src/libmain/Makefile.new +++ b/src/libmain/Makefile.new @@ -1,5 +1,7 @@ LIBS += libmain +libmain_NAME = libnixmain + libmain_DIR := $(d) libmain_SOURCES = shared.cc stack.cc diff --git a/src/libstore/Makefile.new b/src/libstore/Makefile.new index 7d542d3123..eaba1005f2 100644 --- a/src/libstore/Makefile.new +++ b/src/libstore/Makefile.new @@ -1,5 +1,7 @@ LIBS += libstore +libstore_NAME = libnixstore + libstore_DIR := $(d) libstore_SOURCES = \ diff --git a/src/libutil/Makefile.new b/src/libutil/Makefile.new index 59670d2ce0..b604c00787 100644 --- a/src/libutil/Makefile.new +++ b/src/libutil/Makefile.new @@ -1,5 +1,7 @@ LIBS += libutil +libutil_NAME = libnixutil + libutil_DIR := $(d) libutil_SOURCES = util.cc hash.cc serialise.cc archive.cc xml-writer.cc affinity.cc From c7547cff1951aec5e36580a8497dd13020dfc8d3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 23 Nov 2013 23:56:23 +0000 Subject: [PATCH 27/89] Install into $(libdir) instead of $(pkglibdir) We don't need $(pkglibdir) anymore, since the libraries themselves have a "nix" prefix now. --- Makefile.lib | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.lib b/Makefile.lib index 38370c2fec..b9114a07c0 100644 --- a/Makefile.lib +++ b/Makefile.lib @@ -73,7 +73,7 @@ define LIBS_template = $(1)_LDFLAGS_USE += -L$$(_d) -Wl,-rpath,$$(abspath $$(_d)) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME))) - $(1)_INSTALL_DIR := $$(pkglibdir) + $(1)_INSTALL_DIR := $$(libdir) $(1)_INSTALL_PATH := $$($(1)_INSTALL_DIR)/$$($(1)_NAME).so @@ -94,7 +94,7 @@ define LIBS_template = $(1)_LDFLAGS_USE += $$($(1)_PATH) $$($(1)_LDFLAGS) - $(1)_INSTALL_PATH := $$(pkglibdir)/$$($(1)_NAME).a + $(1)_INSTALL_PATH := $$(libdir)/$$($(1)_NAME).a endif From 4315acb8c0a40703b17f837ab82e9a691b5c14ab Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 25 Nov 2013 08:55:19 +0000 Subject: [PATCH 28/89] Add a generic rule for installing files --- Makefile.lib | 14 +++++++++++++- corepkgs/Makefile.new | 3 +++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 corepkgs/Makefile.new diff --git a/Makefile.lib b/Makefile.lib index b9114a07c0..cacf921052 100644 --- a/Makefile.lib +++ b/Makefile.lib @@ -3,11 +3,23 @@ default: all # Include Autoconf variables. Makefile.config: Makefile.config.in - ./config.status + ./config.status --file $@ include Makefile.config +# Installing stuff. +define install-file-in = + + install:: $(1)/$(notdir $(2)) + + $(1)/$(notdir $(2)): $(2) + install -d $(1) + install -t $(1) $(2) + +endef + + # Include all sub-Makefiles. define include_sub_makefile = d := $$(patsubst %/, %, $$(dir $(1))) diff --git a/corepkgs/Makefile.new b/corepkgs/Makefile.new new file mode 100644 index 0000000000..d208478259 --- /dev/null +++ b/corepkgs/Makefile.new @@ -0,0 +1,3 @@ +corepkgs_FILES = nar.nix buildenv.nix buildenv.pl unpack-channel.nix derivation.nix fetchurl.nix imported-drv-to-derivation.nix + +$(foreach file,config.nix $(corepkgs_FILES),$(eval $(call install-file-in,$(datadir)/nix/corepkgs,$(d)/$(file)))) From e9b6397d2f902eb4f5bf0fd513013d92af074cfc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 25 Nov 2013 09:17:02 +0000 Subject: [PATCH 29/89] Add a rule for creating directories The tricky thing here is that if you have a directory as a prerequisite, you need to declare it as a "order-only prerequisite" ("dir/prog: stuff | dir"), otherwise the target will be rebuilt every time because the timestamp on the directory keeps changing. --- Makefile.lib | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/Makefile.lib b/Makefile.lib index cacf921052..be2b19591e 100644 --- a/Makefile.lib +++ b/Makefile.lib @@ -9,12 +9,21 @@ include Makefile.config # Installing stuff. +define create-dir = + ifndef $(1)_SEEN + $(1)_SEEN = 1 + $(1): + install -d $(1) + endif +endef + define install-file-in = install:: $(1)/$(notdir $(2)) - $(1)/$(notdir $(2)): $(2) - install -d $(1) + $$(eval $$(call create-dir,$(1))) + + $(1)/$(notdir $(2)): $(2) | $(1) install -t $(1) $(2) endef @@ -139,7 +148,10 @@ define PROGRAMS_template = $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) $(QUIET) $(CXX) -o $$@ $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) - $(1)_INSTALL_PATH := $$(bindir)/$(1) + $(1)_INSTALL_DIR := $$(bindir) + $(1)_INSTALL_PATH := $$($(1)_INSTALL_DIR)/$(1) + + $$(eval $$(call create-dir,$$($(1)_INSTALL_DIR))) install:: $$($(1)_INSTALL_PATH) @@ -147,15 +159,13 @@ define PROGRAMS_template = _libs_final := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_INSTALL_PATH)) - $$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) - install -d $$(dir $$($(1)_INSTALL_PATH)) - $(QUIET) $(CXX) -o $$($(1)_INSTALL_PATH) $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) + $$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | $$($(1)_INSTALL_DIR) + $(QUIET) $(CXX) -o $$@ $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) else - $$($(1)_INSTALL_PATH): $$($(1)_PATH) - install -d $$(dir $$($(1)_INSTALL_PATH)) - cp $$< $$@ + $$($(1)_INSTALL_PATH): $$($(1)_PATH) | $$($(1)_INSTALL_DIR) + install -t $$($(1)_INSTALL_DIR) $$< endif From f980755766e7cd74c0c959eaa2a6d4655980e2ea Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 25 Nov 2013 09:50:35 +0000 Subject: [PATCH 30/89] Split Makefile.lib into several *.mk files --- Makefile.lib | 201 ------------------------------------------------ Makefile.new | 3 +- mk/clean.mk | 7 ++ mk/dist.mk | 10 +++ mk/install.mk | 23 ++++++ mk/lib.mk | 52 +++++++++++++ mk/libraries.mk | 89 +++++++++++++++++++++ mk/patterns.mk | 5 ++ mk/programs.mk | 56 ++++++++++++++ 9 files changed, 243 insertions(+), 203 deletions(-) delete mode 100644 Makefile.lib create mode 100644 mk/clean.mk create mode 100644 mk/dist.mk create mode 100644 mk/install.mk create mode 100644 mk/lib.mk create mode 100644 mk/libraries.mk create mode 100644 mk/patterns.mk create mode 100644 mk/programs.mk diff --git a/Makefile.lib b/Makefile.lib deleted file mode 100644 index be2b19591e..0000000000 --- a/Makefile.lib +++ /dev/null @@ -1,201 +0,0 @@ -default: all - - -# Include Autoconf variables. -Makefile.config: Makefile.config.in - ./config.status --file $@ - -include Makefile.config - - -# Installing stuff. -define create-dir = - ifndef $(1)_SEEN - $(1)_SEEN = 1 - $(1): - install -d $(1) - endif -endef - -define install-file-in = - - install:: $(1)/$(notdir $(2)) - - $$(eval $$(call create-dir,$(1))) - - $(1)/$(notdir $(2)): $(2) | $(1) - install -t $(1) $(2) - -endef - - -# Include all sub-Makefiles. -define include_sub_makefile = - d := $$(patsubst %/, %, $$(dir $(1))) - include $(1) -endef - -$(foreach mf, $(SUBS), $(eval $(call include_sub_makefile, $(mf)))) - - -# Initialise some variables. -clean_list := -dist_files := -QUIET = @ - - -# Pass -fPIC if we're building dynamic libraries. -ifeq ($(BUILD_SHARED_LIBS), 1) - GLOBAL_CFLAGS += -fPIC - GLOBAL_CXXFLAGS += -fPIC - GLOBAL_LDFLAGS += -Wl,--no-copy-dt-needed-entries -endif - - -# Pass -g if we want debug info. -ifeq ($(BUILD_DEBUG), 1) - GLOBAL_CFLAGS += -g - GLOBAL_CXXFLAGS += -g -endif - - -# Pattern rules. - -%.o: %.cc - $(QUIET) $(CXX) -o $@ -c $< $(GLOBAL_CXXFLAGS) $(CXXFLAGS) $($@_CXXFLAGS) -MMD -MF $(basename $@).dep -MP - -%.o: %.c - $(QUIET) $(CC) -o $@ -c $< $(GLOBAL_CFLAGS) $(CFLAGS) $($@_CFLAGS) -MMD -MF $(basename $@).dep -MP - - -# Generate Make rules for libraries. -libs_list := - -define LIBS_template = - $(1)_NAME ?= $(1) - _d := $$(strip $$($(1)_DIR)) - _srcs := $$(foreach src, $$($(1)_SOURCES), $$(_d)/$$(src)) - $(1)_OBJS := $$(addsuffix .o, $$(basename $$(_srcs))) - _libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_PATH)) - - $(1)_LDFLAGS_USE := - $(1)_LDFLAGS_USE_INSTALLED := - - ifeq ($(BUILD_SHARED_LIBS), 1) - - ifndef $(1)_ALLOW_UNDEFINED - $(1)_LDFLAGS += -z defs - endif - - $(1)_PATH := $$(_d)/$$($(1)_NAME).so - - $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) - $(QUIET) $(CXX) -o $$@ -shared $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) - - $(1)_LDFLAGS_USE += -L$$(_d) -Wl,-rpath,$$(abspath $$(_d)) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME))) - - $(1)_INSTALL_DIR := $$(libdir) - - $(1)_INSTALL_PATH := $$($(1)_INSTALL_DIR)/$$($(1)_NAME).so - - _libs_final := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_INSTALL_PATH)) - - $$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) - install -d $$($(1)_INSTALL_DIR) - $(QUIET) $(CXX) -o $$@ -shared $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) - - $(1)_LDFLAGS_USE_INSTALLED += -L$$($(1)_INSTALL_DIR) -Wl,-rpath,$$($(1)_INSTALL_DIR) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME))) - - else - - $(1)_PATH := $$(_d)/$$($(1)_NAME).a - - $$($(1)_PATH): $$($(1)_OBJS) - $(QUIET) ar crs $$@ $$? - - $(1)_LDFLAGS_USE += $$($(1)_PATH) $$($(1)_LDFLAGS) - - $(1)_INSTALL_PATH := $$(libdir)/$$($(1)_NAME).a - - endif - - $(1)_LDFLAGS_USE += $$($(1)_LDFLAGS_PROPAGATED) - $(1)_LDFLAGS_USE_INSTALLED += $$($(1)_LDFLAGS_PROPAGATED) - - # Propagate CXXFLAGS to the individual object files. - $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS))) - - include $$(wildcard $$(_d)/*.dep) - - libs_list += $$($(1)_PATH) - clean_list += $$(_d)/*.a $$(_d)/*.so $$(_d)/*.o $$(_d)/*.dep - dist_files += $$(_srcs) -endef - -$(foreach lib, $(LIBS), $(eval $(call LIBS_template,$(lib)))) - - -# Generate Make rules for programs. -programs_list := - -define PROGRAMS_template = - _d := $$($(1)_DIR) - _srcs := $$(foreach src, $$($(1)_SOURCES), $$(_d)/$$(src)) - $(1)_OBJS := $$(addsuffix .o, $$(basename $$(_srcs))) - _libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_PATH)) - $(1)_PATH := $$(_d)/$(1) - - $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) - $(QUIET) $(CXX) -o $$@ $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) - - $(1)_INSTALL_DIR := $$(bindir) - $(1)_INSTALL_PATH := $$($(1)_INSTALL_DIR)/$(1) - - $$(eval $$(call create-dir,$$($(1)_INSTALL_DIR))) - - install:: $$($(1)_INSTALL_PATH) - - ifeq ($(BUILD_SHARED_LIBS), 1) - - _libs_final := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_INSTALL_PATH)) - - $$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | $$($(1)_INSTALL_DIR) - $(QUIET) $(CXX) -o $$@ $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) - - else - - $$($(1)_INSTALL_PATH): $$($(1)_PATH) | $$($(1)_INSTALL_DIR) - install -t $$($(1)_INSTALL_DIR) $$< - - endif - - # Propagate CXXFLAGS to the individual object files. - $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS))) - - include $$(wildcard $$(_d)/*.dep) - - programs_list += $$($(1)_PATH) - clean_list += $$($(1)_PATH) $$(_d)/*.o $$(_d)/*.dep - dist_files += $$(_srcs) -endef - -$(foreach prog, $(PROGRAMS), $(eval $(call PROGRAMS_template,$(prog)))) - - -# Distributing stuff. -dist_name = $(PACKAGE_NAME)-$(PACKAGE_VERSION) - -dist: - @echo $(dist_files) - $(QUIET) tar cvfj $(dist_name).tar.bz2 $(dist_files) --transform 's,^,$(dist_name)/,' - - -# Cleaning stuff. -clean: - rm -fv $(clean_list) - -dryclean: - @echo $(clean_list) - - -all: $(programs_list) diff --git a/Makefile.new b/Makefile.new index e1ed0615c5..ed090a1f47 100644 --- a/Makefile.new +++ b/Makefile.new @@ -14,5 +14,4 @@ SUBS = \ GLOBAL_CXXFLAGS = -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr -include Makefile.lib - +include mk/lib.mk diff --git a/mk/clean.mk b/mk/clean.mk new file mode 100644 index 0000000000..3287ac8732 --- /dev/null +++ b/mk/clean.mk @@ -0,0 +1,7 @@ +clean_files := + +clean: + rm -fv $(clean_files) + +dryclean: + @echo $(clean_files) diff --git a/mk/dist.mk b/mk/dist.mk new file mode 100644 index 0000000000..3e89aec81f --- /dev/null +++ b/mk/dist.mk @@ -0,0 +1,10 @@ +dist_name = $(PACKAGE_NAME)-$(PACKAGE_VERSION) + +dist_files := + +dist: $(dist_name).tar.bz2 + +$(dist_name).tar.bz2: $(dist_files) + $(QUIET) tar cvfj $@ $(dist_files) --transform 's,^,$(dist_name)/,' + +clean_files += $(dist_name).tar.bz2 diff --git a/mk/install.mk b/mk/install.mk new file mode 100644 index 0000000000..32048a38b2 --- /dev/null +++ b/mk/install.mk @@ -0,0 +1,23 @@ +# Add a rule for creating $(1) as a directory. This template may be +# called multiple times for the same directory. +define create-dir = + ifndef $(1)_SEEN + $(1)_SEEN = 1 + $(1): + install -d $(1) + endif +endef + + +# Add a rule for installing file $(2) in directory $(1). The +# directory will be created automatically. +define install-file-in = + + install:: $(1)/$(notdir $(2)) + + $$(eval $$(call create-dir,$(1))) + + $(1)/$(notdir $(2)): $(2) | $(1) + install -t $(1) $(2) + +endef diff --git a/mk/lib.mk b/mk/lib.mk new file mode 100644 index 0000000000..212336cad2 --- /dev/null +++ b/mk/lib.mk @@ -0,0 +1,52 @@ +default: all + + +# Include Autoconf variables. +Makefile.config: Makefile.config.in + ./config.status --file $@ + +include Makefile.config + + +# Initialise some variables. +QUIET = @ + + +# Pass -fPIC if we're building dynamic libraries. +ifeq ($(BUILD_SHARED_LIBS), 1) + GLOBAL_CFLAGS += -fPIC + GLOBAL_CXXFLAGS += -fPIC + GLOBAL_LDFLAGS += -Wl,--no-copy-dt-needed-entries +endif + + +# Pass -g if we want debug info. +ifeq ($(BUILD_DEBUG), 1) + GLOBAL_CFLAGS += -g + GLOBAL_CXXFLAGS += -g +endif + + +include mk/clean.mk +include mk/dist.mk +include mk/install.mk +include mk/libraries.mk +include mk/programs.mk +include mk/patterns.mk + + +# Include all sub-Makefiles. +define include-sub-makefile = + d := $$(patsubst %/, %, $$(dir $(1))) + include $(1) +endef + +$(foreach mf, $(SUBS), $(eval $(call include-sub-makefile, $(mf)))) + + +# Instantiate libraries and programs. +$(foreach lib, $(LIBS), $(eval $(call build-library,$(lib)))) +$(foreach prog, $(PROGRAMS), $(eval $(call build-program,$(prog)))) + + +all: $(programs_list) diff --git a/mk/libraries.mk b/mk/libraries.mk new file mode 100644 index 0000000000..8b1e848e09 --- /dev/null +++ b/mk/libraries.mk @@ -0,0 +1,89 @@ +libs_list := + +# Build a library with symbolic name $(1). The library is defined by +# various variables prefixed by ‘$(1)_’: +# +# - $(1)_NAME: the name of the library (e.g. ‘libfoo’); defaults to +# $(1). +# +# - $(1)_DIR: the directory containing the sources of the library, and +# where the (non-installed) library will be placed. +# +# - $(1)_SOURCES: the source files of the library. +# +# - $(1)_LIBS: the symbolic names of other libraries on which this +# library depends. +# +# - $(1)_ALLOW_UNDEFINED: if set, the library is allowed to have +# undefined symbols. Has no effect for static libraries. +# +# - $(1)_LDFLAGS: additional linker flags. +# +# - $(1)_LDFLAGS_PROPAGATED: additional linker flags, also propagated +# to the linking of programs/libraries that use this library. +# +# - BUILD_SHARED_LIBS: if equal to ‘1’, a dynamic library will be +# built, otherwise a static library. +# +# - libdir: the directory where the library will be installed (if +# required). +define build-library = + $(1)_NAME ?= $(1) + _d := $$(strip $$($(1)_DIR)) + _srcs := $$(foreach src, $$($(1)_SOURCES), $$(_d)/$$(src)) + $(1)_OBJS := $$(addsuffix .o, $$(basename $$(_srcs))) + _libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_PATH)) + + $(1)_LDFLAGS_USE := + $(1)_LDFLAGS_USE_INSTALLED := + + ifeq ($(BUILD_SHARED_LIBS), 1) + + ifndef $(1)_ALLOW_UNDEFINED + $(1)_LDFLAGS += -z defs + endif + + $(1)_PATH := $$(_d)/$$($(1)_NAME).so + + $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) + $(QUIET) $(CXX) -o $$@ -shared $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) + + $(1)_LDFLAGS_USE += -L$$(_d) -Wl,-rpath,$$(abspath $$(_d)) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME))) + + $(1)_INSTALL_DIR := $$(libdir) + + $(1)_INSTALL_PATH := $$($(1)_INSTALL_DIR)/$$($(1)_NAME).so + + _libs_final := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_INSTALL_PATH)) + + $$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) + install -d $$($(1)_INSTALL_DIR) + $(QUIET) $(CXX) -o $$@ -shared $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) + + $(1)_LDFLAGS_USE_INSTALLED += -L$$($(1)_INSTALL_DIR) -Wl,-rpath,$$($(1)_INSTALL_DIR) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME))) + + else + + $(1)_PATH := $$(_d)/$$($(1)_NAME).a + + $$($(1)_PATH): $$($(1)_OBJS) + $(QUIET) ar crs $$@ $$? + + $(1)_LDFLAGS_USE += $$($(1)_PATH) $$($(1)_LDFLAGS) + + $(1)_INSTALL_PATH := $$(libdir)/$$($(1)_NAME).a + + endif + + $(1)_LDFLAGS_USE += $$($(1)_LDFLAGS_PROPAGATED) + $(1)_LDFLAGS_USE_INSTALLED += $$($(1)_LDFLAGS_PROPAGATED) + + # Propagate CXXFLAGS to the individual object files. + $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS))) + + include $$(wildcard $$(_d)/*.dep) + + libs_list += $$($(1)_PATH) + clean_files += $$(_d)/*.a $$(_d)/*.so $$(_d)/*.o $$(_d)/*.dep + dist_files += $$(_srcs) +endef diff --git a/mk/patterns.mk b/mk/patterns.mk new file mode 100644 index 0000000000..87d90955bf --- /dev/null +++ b/mk/patterns.mk @@ -0,0 +1,5 @@ +%.o: %.cc + $(QUIET) $(CXX) -o $@ -c $< $(GLOBAL_CXXFLAGS) $(CXXFLAGS) $($@_CXXFLAGS) -MMD -MF $(basename $@).dep -MP + +%.o: %.c + $(QUIET) $(CC) -o $@ -c $< $(GLOBAL_CFLAGS) $(CFLAGS) $($@_CFLAGS) -MMD -MF $(basename $@).dep -MP diff --git a/mk/programs.mk b/mk/programs.mk new file mode 100644 index 0000000000..e26e9af7a3 --- /dev/null +++ b/mk/programs.mk @@ -0,0 +1,56 @@ +programs_list := + +# Build a program with symbolic name $(1). The program is defined by +# various variables prefixed by ‘$(1)_’: +# +# - $(1)_DIR: the directory containing the sources of the program, and +# where the (non-installed) program will be placed. +# +# - $(1)_SOURCES: the source files of the program. +# +# - $(1)_LIBS: the symbolic names of libraries on which this program +# depends. +# +# - $(1)_LDFLAGS: additional linker flags. +# +# - bindir: the directory where the program will be installed. +define build-program = + _d := $$($(1)_DIR) + _srcs := $$(foreach src, $$($(1)_SOURCES), $$(_d)/$$(src)) + $(1)_OBJS := $$(addsuffix .o, $$(basename $$(_srcs))) + _libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_PATH)) + $(1)_PATH := $$(_d)/$(1) + + $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) + $(QUIET) $(CXX) -o $$@ $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) + + $(1)_INSTALL_DIR := $$(bindir) + $(1)_INSTALL_PATH := $$($(1)_INSTALL_DIR)/$(1) + + $$(eval $$(call create-dir,$$($(1)_INSTALL_DIR))) + + install:: $$($(1)_INSTALL_PATH) + + ifeq ($(BUILD_SHARED_LIBS), 1) + + _libs_final := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_INSTALL_PATH)) + + $$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | $$($(1)_INSTALL_DIR) + $(QUIET) $(CXX) -o $$@ $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) + + else + + $$($(1)_INSTALL_PATH): $$($(1)_PATH) | $$($(1)_INSTALL_DIR) + install -t $$($(1)_INSTALL_DIR) $$< + + endif + + # Propagate CXXFLAGS to the individual object files. + $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS))) + + include $$(wildcard $$(_d)/*.dep) + + programs_list += $$($(1)_PATH) + clean_files += $$($(1)_PATH) $$(_d)/*.o $$(_d)/*.dep + dist_files += $$(_srcs) +endef From ed0a8dd71ad58d16c24d714ab2b9419285d1ffc0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 25 Nov 2013 10:16:07 +0000 Subject: [PATCH 31/89] Add a function for instantiating Autoconf *.in files --- corepkgs/Makefile.new | 2 ++ mk/lib.mk | 8 ++++---- mk/templates.mk | 8 ++++++++ 3 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 mk/templates.mk diff --git a/corepkgs/Makefile.new b/corepkgs/Makefile.new index d208478259..5b500a679a 100644 --- a/corepkgs/Makefile.new +++ b/corepkgs/Makefile.new @@ -1,3 +1,5 @@ corepkgs_FILES = nar.nix buildenv.nix buildenv.pl unpack-channel.nix derivation.nix fetchurl.nix imported-drv-to-derivation.nix $(foreach file,config.nix $(corepkgs_FILES),$(eval $(call install-file-in,$(datadir)/nix/corepkgs,$(d)/$(file)))) + +template_files += $(d)/config.nix diff --git a/mk/lib.mk b/mk/lib.mk index 212336cad2..b4a2fb265c 100644 --- a/mk/lib.mk +++ b/mk/lib.mk @@ -2,9 +2,7 @@ default: all # Include Autoconf variables. -Makefile.config: Makefile.config.in - ./config.status --file $@ - +template_files += Makefile.config include Makefile.config @@ -33,6 +31,7 @@ include mk/install.mk include mk/libraries.mk include mk/programs.mk include mk/patterns.mk +include mk/templates.mk # Include all sub-Makefiles. @@ -44,9 +43,10 @@ endef $(foreach mf, $(SUBS), $(eval $(call include-sub-makefile, $(mf)))) -# Instantiate libraries and programs. +# Instantiate stuff. $(foreach lib, $(LIBS), $(eval $(call build-library,$(lib)))) $(foreach prog, $(PROGRAMS), $(eval $(call build-program,$(prog)))) +$(foreach template, $(template_files), $(eval $(call instantiate-template,$(template)))) all: $(programs_list) diff --git a/mk/templates.mk b/mk/templates.mk new file mode 100644 index 0000000000..3575b6d956 --- /dev/null +++ b/mk/templates.mk @@ -0,0 +1,8 @@ +# Create the file $(1) from $(1).in by running config.status (which +# substitutes all ‘@var@’ variables set by the configure script). +define instantiate-template = + + $(1): $(1).in + ./config.status --file $(1) + +endef From 79b7c596a994dd426807281c3c34d8cb6bc12e5f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 25 Nov 2013 10:17:37 +0000 Subject: [PATCH 32/89] Use create-dir for installing dynamic libraries --- mk/install.mk | 4 ++-- mk/libraries.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mk/install.mk b/mk/install.mk index 32048a38b2..64fc6a696a 100644 --- a/mk/install.mk +++ b/mk/install.mk @@ -4,7 +4,7 @@ define create-dir = ifndef $(1)_SEEN $(1)_SEEN = 1 $(1): - install -d $(1) + $(QUIET) install -d $(1) endif endef @@ -18,6 +18,6 @@ define install-file-in = $$(eval $$(call create-dir,$(1))) $(1)/$(notdir $(2)): $(2) | $(1) - install -t $(1) $(2) + $(QUIET) install -t $(1) $(2) endef diff --git a/mk/libraries.mk b/mk/libraries.mk index 8b1e848e09..633bfdba81 100644 --- a/mk/libraries.mk +++ b/mk/libraries.mk @@ -56,8 +56,9 @@ define build-library = _libs_final := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_INSTALL_PATH)) - $$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) - install -d $$($(1)_INSTALL_DIR) + $$(eval $$(call create-dir,$$($(1)_INSTALL_DIR))) + + $$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | $$($(1)_INSTALL_DIR) $(QUIET) $(CXX) -o $$@ -shared $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) $(1)_LDFLAGS_USE_INSTALLED += -L$$($(1)_INSTALL_DIR) -Wl,-rpath,$$($(1)_INSTALL_DIR) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME))) From 2cc591c7b55a1d3e8f667871b0ddf216d81d6b47 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 25 Nov 2013 10:56:14 +0000 Subject: [PATCH 33/89] Don't instantiate Automake makefiles --- configure.ac | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/configure.ac b/configure.ac index 5ecf2d9529..e5fa2437a3 100644 --- a/configure.ac +++ b/configure.ac @@ -358,29 +358,5 @@ AC_SUBST(tarFlags) AC_CONFIG_HEADER([config.h]) -AC_CONFIG_FILES([Makefile - src/Makefile - src/boost/Makefile - src/boost/format/Makefile - src/libutil/Makefile - src/libstore/Makefile - src/libmain/Makefile - src/nix-store/Makefile - src/nix-hash/Makefile - src/libexpr/Makefile - src/nix-instantiate/Makefile - src/nix-env/Makefile - src/nix-daemon/Makefile - src/nix-log2xml/Makefile - src/bsdiff-4.3/Makefile - perl/Makefile - scripts/Makefile - corepkgs/Makefile - doc/Makefile - doc/manual/Makefile - misc/Makefile - misc/emacs/Makefile - tests/Makefile - Makefile.config - ]) +AC_CONFIG_FILES([]) AC_OUTPUT From 0c504a756cbcf58f0fc4b1a9083d372e1dbb50ac Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 25 Nov 2013 11:18:41 +0000 Subject: [PATCH 34/89] Don't install Libtool --- configure.ac | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/configure.ac b/configure.ac index e5fa2437a3..7028e5f9f4 100644 --- a/configure.ac +++ b/configure.ac @@ -47,17 +47,6 @@ AC_DEFINE_UNQUOTED(SYSTEM, ["$system"], [platform identifier (`cpu-os')]) test "$localstatedir" = '${prefix}/var' && localstatedir=/nix/var -# Windows-specific stuff. On Cygwin, dynamically linking against the -# ATerm DLL works, except that it requires the ATerm "lib" directory -# to be in $PATH, as Windows doesn't have anything like an RPATH -# embedded in executable. Since this is kind of annoying, we use -# static libraries for now. -if test "$sys_name" = "cygwin"; then - AC_DISABLE_SHARED - AC_ENABLE_STATIC -fi - - # Solaris-specific stuff. if test "$sys_name" = sunos; then # Solaris requires -lsocket -lnsl for network functions @@ -80,11 +69,6 @@ if test "$CC_FOR_BUILD" = ""; then fi AC_SUBST([CC_FOR_BUILD]) -# We are going to use libtool. -AC_DISABLE_STATIC -AC_ENABLE_SHARED -AC_PROG_LIBTOOL - # Use 64-bit file system calls so that we can support files > 2 GiB. AC_SYS_LARGEFILE From b225ccb65455b24141cffd6706b6fba8a4838525 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 25 Nov 2013 11:26:02 +0000 Subject: [PATCH 35/89] Add config.guess, config.sub and install-sh Autoreconf doesn't install these if you're not using Automake. --- .gitignore | 9 - config/config.guess | 1537 +++++++++++++++++++++++++++++++++++++ config/config.sub | 1786 +++++++++++++++++++++++++++++++++++++++++++ config/install-sh | 527 +++++++++++++ 4 files changed, 3850 insertions(+), 9 deletions(-) create mode 100755 config/config.guess create mode 100755 config/config.sub create mode 100755 config/install-sh diff --git a/.gitignore b/.gitignore index ed9bd45a45..961877ada3 100644 --- a/.gitignore +++ b/.gitignore @@ -13,15 +13,6 @@ Makefile.config /NEWS /libtool -# /config/ -/config/config.guess -/config/config.sub -/config/depcomp -/config/install-sh -/config/missing -/config/mkinstalldirs -/config/ltmain.sh - /corepkgs/config.nix # /corepkgs/buildenv/ diff --git a/config/config.guess b/config/config.guess new file mode 100755 index 0000000000..137bedf2e2 --- /dev/null +++ b/config/config.guess @@ -0,0 +1,1537 @@ +#! /bin/sh +# Attempt to guess a canonical system name. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. + +timestamp='2012-08-14' + +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, see . +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + + +# Originally written by Per Bothner. Please send patches (context +# diff format) to and include a ChangeLog +# entry. +# +# This script attempts to guess a canonical system name similar to +# config.sub. If it succeeds, it prints the system name on stdout, and +# exits with 0. Otherwise, it exits with 1. +# +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] + +Output the configuration name of the system \`$me' is run on. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.guess ($timestamp) + +Originally written by Per Bothner. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" >&2 + exit 1 ;; + * ) + break ;; + esac +done + +if test $# != 0; then + echo "$me: too many arguments$help" >&2 + exit 1 +fi + +trap 'exit 1' 1 2 15 + +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a +# compiler to aid in system detection is discouraged as it requires +# temporary files to be created and, as you can see below, it is a +# headache to deal with in a portable fashion. + +# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still +# use `HOST_CC' if defined, but it is deprecated. + +# Portable tmp directory creation inspired by the Autoconf team. + +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int x;" > $dummy.c ; + for c in cc gcc c89 c99 ; do + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + CC_FOR_BUILD="$c"; break ; + fi ; + done ; + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found ; + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +esac ; set_cc_for_build= ;' + +# This is needed to find uname on a Pyramid OSx when run in the BSD universe. +# (ghazi@noc.rutgers.edu 1994-08-24) +if (test -f /.attbin/uname) >/dev/null 2>&1 ; then + PATH=$PATH:/.attbin ; export PATH +fi + +UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown +UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + +# Note: order is significant - the case branches are not exclusive. + +case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward + # compatibility and a consistent mechanism for selecting the + # object file format. + # + # Note: NetBSD doesn't particularly care about the vendor + # portion of the name. We always set it to "unknown". + sysctl="sysctl -n hw.machine_arch" + UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + case "${UNAME_MACHINE_ARCH}" in + armeb) machine=armeb-unknown ;; + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + esac + # The Operating System including object format, if it has switched + # to ELF recently, or will in the future. + case "${UNAME_MACHINE_ARCH}" in + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ELF__ + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? + os=netbsd + else + os=netbsdelf + fi + ;; + *) + os=netbsd + ;; + esac + # The OS release + # Debian GNU/NetBSD machines have a different userland, and + # thus, need a distinct triplet. However, they do not need + # kernel version information, so it can be replaced with a + # suitable tag, in the style of linux-gnu. + case "${UNAME_VERSION}" in + Debian*) + release='-gnu' + ;; + *) + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + ;; + esac + # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" + exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; + *:OpenBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; + macppc:MirBSD:*:*) + echo powerpc-unknown-mirbsd${UNAME_RELEASE} + exit ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit ;; + alpha:OSF1:*:*) + case $UNAME_RELEASE in + *4.0) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU + # types through head -n 1, so we only detect the type of CPU 0. + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") + UNAME_MACHINE="alpha" ;; + "EV4.5 (21064)") + UNAME_MACHINE="alpha" ;; + "LCA4 (21066/21068)") + UNAME_MACHINE="alpha" ;; + "EV5 (21164)") + UNAME_MACHINE="alphaev5" ;; + "EV5.6 (21164A)") + UNAME_MACHINE="alphaev56" ;; + "EV5.6 (21164PC)") + UNAME_MACHINE="alphapca56" ;; + "EV5.7 (21164PC)") + UNAME_MACHINE="alphapca57" ;; + "EV6 (21264)") + UNAME_MACHINE="alphaev6" ;; + "EV6.7 (21264A)") + UNAME_MACHINE="alphaev67" ;; + "EV6.8CB (21264C)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8AL (21264B)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8CX (21264D)") + UNAME_MACHINE="alphaev68" ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE="alphaev69" ;; + "EV7 (21364)") + UNAME_MACHINE="alphaev7" ;; + "EV7.9 (21364A)") + UNAME_MACHINE="alphaev79" ;; + esac + # A Pn.n version is a patched version. + # A Vn.n version is a released version. + # A Tn.n version is a released field test version. + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead + # of the specific Alpha model? + echo alpha-pc-interix + exit ;; + 21064:Windows_NT:50:3) + echo alpha-dec-winnt3.5 + exit ;; + Amiga*:UNIX_System_V:4.0:*) + echo m68k-unknown-sysv4 + exit ;; + *:[Aa]miga[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-amigaos + exit ;; + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos + exit ;; + *:OS/390:*:*) + echo i370-ibm-openedition + exit ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} + exit ;; + arm:riscos:*:*|arm:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) + echo hppa1.1-hitachi-hiuxmpp + exit ;; + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) + # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. + if test "`(/bin/universe) 2>/dev/null`" = att ; then + echo pyramid-pyramid-sysv3 + else + echo pyramid-pyramid-bsd + fi + exit ;; + NILE*:*:*:dcosx) + echo pyramid-pyramid-svr4 + exit ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit ;; + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7; exit ;; + esac ;; + s390x:SunOS:*:*) + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) + echo i386-pc-auroraux${UNAME_RELEASE} + exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + eval $set_cc_for_build + SUN_ARCH="i386" + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH="x86_64" + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize + # SunOS6. Hard to guess exactly what SunOS6 will be like, but + # it's likely to be more like Solaris than SunOS4. + echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:*:*) + case "`/usr/bin/arch -k`" in + Series*|S4*) + UNAME_RELEASE=`uname -v` + ;; + esac + # Japanese Language versions have a version number like `4.1.3-JL'. + echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` + exit ;; + sun3*:SunOS:*:*) + echo m68k-sun-sunos${UNAME_RELEASE} + exit ;; + sun*:*:4.2BSD:*) + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + case "`/bin/arch`" in + sun3) + echo m68k-sun-sunos${UNAME_RELEASE} + ;; + sun4) + echo sparc-sun-sunos${UNAME_RELEASE} + ;; + esac + exit ;; + aushp:SunOS:*:*) + echo sparc-auspex-sunos${UNAME_RELEASE} + exit ;; + # The situation for MiNT is a little confusing. The machine name + # can be virtually everything (everything which is not + # "atarist" or "atariste" at least should have a processor + # > m68000). The system name ranges from "MiNT" over "FreeMiNT" + # to the lowercase version "mint" (or "freemint"). Finally + # the system name "TOS" denotes a system which is actually not + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} + exit ;; + RISC*:Mach:*:*) + echo mips-dec-mach_bsd4.3 + exit ;; + RISC*:ULTRIX:*:*) + echo mips-dec-ultrix${UNAME_RELEASE} + exit ;; + VAX*:ULTRIX*:*:*) + echo vax-dec-ultrix${UNAME_RELEASE} + exit ;; + 2020:CLIX:*:* | 2430:CLIX:*:*) + echo clipper-intergraph-clix${UNAME_RELEASE} + exit ;; + mips:*:*:UMIPS | mips:*:*:RISCos) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +#ifdef __cplusplus +#include /* for printf() prototype */ + int main (int argc, char *argv[]) { +#else + int main (argc, argv) int argc; char *argv[]; { +#endif + #if defined (host_mips) && defined (MIPSEB) + #if defined (SYSTYPE_SYSV) + printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_SVR4) + printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) + printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); + #endif + #endif + exit (-1); + } +EOF + $CC_FOR_BUILD -o $dummy $dummy.c && + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`$dummy $dummyarg` && + { echo "$SYSTEM_NAME"; exit; } + echo mips-mips-riscos${UNAME_RELEASE} + exit ;; + Motorola:PowerMAX_OS:*:*) + echo powerpc-motorola-powermax + exit ;; + Motorola:*:4.3:PL8-*) + echo powerpc-harris-powermax + exit ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + echo powerpc-harris-powermax + exit ;; + Night_Hawk:Power_UNIX:*:*) + echo powerpc-harris-powerunix + exit ;; + m88k:CX/UX:7*:*) + echo m88k-harris-cxux7 + exit ;; + m88k:*:4*:R4*) + echo m88k-motorola-sysv4 + exit ;; + m88k:*:3*:R3*) + echo m88k-motorola-sysv3 + exit ;; + AViiON:dgux:*:*) + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ + [ ${TARGET_BINARY_INTERFACE}x = x ] + then + echo m88k-dg-dgux${UNAME_RELEASE} + else + echo m88k-dg-dguxbcs${UNAME_RELEASE} + fi + else + echo i586-dg-dgux${UNAME_RELEASE} + fi + exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 + exit ;; + M88*:*:R3*:*) + # Delta 88k system running SVR3 + echo m88k-motorola-sysv3 + exit ;; + XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) + echo m88k-tektronix-sysv3 + exit ;; + Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) + echo m68k-tektronix-bsd + exit ;; + *:IRIX*:*:*) + echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` + exit ;; + ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + i*86:AIX:*:*) + echo i386-ibm-aix + exit ;; + ia64:AIX:*:*) + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} + exit ;; + *:AIX:2:3) + if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + + main() + { + if (!__power_pc()) + exit(1); + puts("powerpc-ibm-aix3.2.5"); + exit(0); + } +EOF + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + then + echo "$SYSTEM_NAME" + else + echo rs6000-ibm-aix3.2.5 + fi + elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then + echo rs6000-ibm-aix3.2.4 + else + echo rs6000-ibm-aix3.2 + fi + exit ;; + *:AIX:*:[4567]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 + else + IBM_ARCH=powerpc + fi + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${IBM_ARCH}-ibm-aix${IBM_REV} + exit ;; + *:AIX:*:*) + echo rs6000-ibm-aix + exit ;; + ibmrt:4.4BSD:*|romp-ibm:BSD:*) + echo romp-ibm-bsd4.4 + exit ;; + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and + echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to + exit ;; # report: romp-ibm BSD 4.3 + *:BOSX:*:*) + echo rs6000-bull-bosx + exit ;; + DPX/2?00:B.O.S.:*:*) + echo m68k-bull-sysv3 + exit ;; + 9000/[34]??:4.3bsd:1.*:*) + echo m68k-hp-bsd + exit ;; + hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) + echo m68k-hp-bsd4.4 + exit ;; + 9000/[34678]??:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + case "${UNAME_MACHINE}" in + 9000/31? ) HP_ARCH=m68000 ;; + 9000/[34]?? ) HP_ARCH=m68k ;; + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 + esac ;; + esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include + + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } +EOF + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa + fi ;; + esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then + eval $set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + grep -q __LP64__ + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi + echo ${HP_ARCH}-hp-hpux${HPUX_REV} + exit ;; + ia64:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux${HPUX_REV} + exit ;; + 3050*:HI-UX:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + int + main () + { + long cpu = sysconf (_SC_CPU_VERSION); + /* The order matters, because CPU_IS_HP_MC68K erroneously returns + true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct + results, however. */ + if (CPU_IS_PA_RISC (cpu)) + { + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; + case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; + default: puts ("hppa-hitachi-hiuxwe2"); break; + } + } + else if (CPU_IS_HP_MC68K (cpu)) + puts ("m68k-hitachi-hiuxwe2"); + else puts ("unknown-hitachi-hiuxwe2"); + exit (0); + } +EOF + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } + echo unknown-hitachi-hiuxwe2 + exit ;; + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + echo hppa1.1-hp-bsd + exit ;; + 9000/8??:4.3bsd:*:*) + echo hppa1.0-hp-bsd + exit ;; + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) + echo hppa1.0-hp-mpeix + exit ;; + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + echo hppa1.1-hp-osf + exit ;; + hp8??:OSF1:*:*) + echo hppa1.0-hp-osf + exit ;; + i*86:OSF1:*:*) + if [ -x /usr/sbin/sysversion ] ; then + echo ${UNAME_MACHINE}-unknown-osf1mk + else + echo ${UNAME_MACHINE}-unknown-osf1 + fi + exit ;; + parisc*:Lites*:*:*) + echo hppa1.1-hp-lites + exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd + exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd + exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd + exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd + exit ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*[A-Z]90:*:*:*) + echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ + -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*TS:*:*:*) + echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*T3E:*:*:*) + echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*SV1:*:*:*) + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + *:UNICOS/mp:*:*) + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + exit ;; + sparc*:BSD/OS:*:*) + echo sparc-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:BSD/OS:*:*) + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:FreeBSD:*:*) + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; + *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; + *:Interix*:*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + authenticamd | genuineintel | EM64T) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit ;; + 8664:Windows_NT:*) + echo x86_64-pc-mks + exit ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we + # UNAME_MACHINE based on the output of uname instead of i386? + echo i586-pc-interix + exit ;; + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin + exit ;; + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin + exit ;; + prep*:SunOS:5.*:*) + echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + *:GNU:*:*) + # the GNU system + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + exit ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + exit ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + exit ;; + arm*:Linux:*:*) + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-gnu + else + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + fi + fi + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + cris:Linux:*:*) + echo ${UNAME_MACHINE}-axis-linux-gnu + exit ;; + crisv32:Linux:*:*) + echo ${UNAME_MACHINE}-axis-linux-gnu + exit ;; + frv:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + i*86:Linux:*:*) + LIBC=gnu + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #ifdef __dietlibc__ + LIBC=dietlibc + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + mips:Linux:*:* | mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=${UNAME_MACHINE}el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=${UNAME_MACHINE} + #else + CPU= + #endif + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + or32:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-gnu + exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-gnu + exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in + PA7*) echo hppa1.1-unknown-linux-gnu ;; + PA8*) echo hppa2.0-unknown-linux-gnu ;; + *) echo hppa-unknown-linux-gnu ;; + esac + exit ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-gnu + exit ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-gnu + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux + exit ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; + x86_64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both + # sysname and nodename. + echo i386-sequent-sysv4 + exit ;; + i*86:UNIX_SV:4.2MP:2.*) + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. + # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + exit ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx + exit ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit ;; + i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) + UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then + echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} + else + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + fi + exit ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; + *Pent*|*Celeron) UNAME_MACHINE=i686 ;; + esac + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + exit ;; + i*86:*:3.2:*) + if test -f /usr/options/cb.name; then + UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ + && UNAME_MACHINE=i586 + (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ + && UNAME_MACHINE=i686 + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ + && UNAME_MACHINE=i686 + echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + else + echo ${UNAME_MACHINE}-pc-sysv32 + fi + exit ;; + pc:*:*:*) + # Left here for compatibility: + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. + # Note: whatever this is, it MUST be the same as what config.sub + # prints for the "djgpp" host, or else GDB configury will decide that + # this is a cross-build. + echo i586-pc-msdosdjgpp + exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 + exit ;; + paragon:*:*:*) + echo i860-intel-osf1 + exit ;; + i860:*:4.*:*) # i860-SVR4 + if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then + echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + else # Add other i860-SVR4 vendors below as they are discovered. + echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + fi + exit ;; + mini*:CTIX:SYS*5:*) + # "miniframe" + echo m68010-convergent-sysv + exit ;; + mc68k:UNIX:SYSTEM5:3.51m) + echo m68k-convergent-sysv + exit ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix + exit ;; + M68*:*:R3V[5678]*:*) + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) + OS_REL='' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} + exit ;; + mc68030:UNIX_System_V:4.*:*) + echo m68k-atari-sysv4 + exit ;; + TSUNAMI:LynxOS:2.*:*) + echo sparc-unknown-lynxos${UNAME_RELEASE} + exit ;; + rs6000:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} + exit ;; + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} + exit ;; + SM[BE]S:UNIX_SV:*:*) + echo mips-dde-sysv${UNAME_RELEASE} + exit ;; + RM*:ReliantUNIX-*:*:*) + echo mips-sni-sysv4 + exit ;; + RM*:SINIX-*:*:*) + echo mips-sni-sysv4 + exit ;; + *:SINIX-*:*:*) + if uname -p 2>/dev/null >/dev/null ; then + UNAME_MACHINE=`(uname -p) 2>/dev/null` + echo ${UNAME_MACHINE}-sni-sysv4 + else + echo ns32k-sni-sysv + fi + exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm + echo hppa1.1-stratus-sysv4 + exit ;; + *:*:*:FTX*) + # From seanf@swdc.stratus.com. + echo i860-stratus-sysv4 + exit ;; + i*86:VOS:*:*) + # From Paul.Green@stratus.com. + echo ${UNAME_MACHINE}-stratus-vos + exit ;; + *:VOS:*:*) + # From Paul.Green@stratus.com. + echo hppa1.1-stratus-vos + exit ;; + mc68*:A/UX:*:*) + echo m68k-apple-aux${UNAME_RELEASE} + exit ;; + news*:NEWS-OS:6*:*) + echo mips-sony-newsos6 + exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then + echo mips-nec-sysv${UNAME_RELEASE} + else + echo mips-unknown-sysv${UNAME_RELEASE} + fi + exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit ;; + BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. + echo powerpc-apple-beos + exit ;; + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos + exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; + SX-5:SUPER-UX:*:*) + echo sx5-nec-superux${UNAME_RELEASE} + exit ;; + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} + exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} + exit ;; + *:Rhapsody:*:*) + echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + exit ;; + *:Darwin:*:*) + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in + i386) + eval $set_cc_for_build + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + UNAME_PROCESSOR="x86_64" + fi + fi ;; + unknown) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + exit ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) + UNAME_PROCESSOR=`uname -p` + if test "$UNAME_PROCESSOR" = "x86"; then + UNAME_PROCESSOR=i386 + UNAME_MACHINE=pc + fi + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} + exit ;; + *:QNX:*:4*) + echo i386-pc-qnx + exit ;; + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; + NSE-*:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} + exit ;; + *:NonStop-UX:*:*) + echo mips-compaq-nonstopux + exit ;; + BS2000:POSIX*:*:*) + echo bs2000-siemens-sysv + exit ;; + DS/*:UNIX_System_V:*:*) + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + exit ;; + *:Plan9:*:*) + # "uname -m" is not consistent, so use $cputype instead. 386 + # is converted to i386 for consistency with other x86 + # operating systems. + if test "$cputype" = "386"; then + UNAME_MACHINE=i386 + else + UNAME_MACHINE="$cputype" + fi + echo ${UNAME_MACHINE}-unknown-plan9 + exit ;; + *:TOPS-10:*:*) + echo pdp10-unknown-tops10 + exit ;; + *:TENEX:*:*) + echo pdp10-unknown-tenex + exit ;; + KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) + echo pdp10-dec-tops20 + exit ;; + XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) + echo pdp10-xkl-tops20 + exit ;; + *:TOPS-20:*:*) + echo pdp10-unknown-tops20 + exit ;; + *:ITS:*:*) + echo pdp10-unknown-its + exit ;; + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit ;; + i*86:skyos:*:*) + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; +esac + +eval $set_cc_for_build +cat >$dummy.c < +# include +#endif +main () +{ +#if defined (sony) +#if defined (MIPSEB) + /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, + I don't know.... */ + printf ("mips-sony-bsd\n"); exit (0); +#else +#include + printf ("m68k-sony-newsos%s\n", +#ifdef NEWSOS4 + "4" +#else + "" +#endif + ); exit (0); +#endif +#endif + +#if defined (__arm) && defined (__acorn) && defined (__unix) + printf ("arm-acorn-riscix\n"); exit (0); +#endif + +#if defined (hp300) && !defined (hpux) + printf ("m68k-hp-bsd\n"); exit (0); +#endif + +#if defined (NeXT) +#if !defined (__ARCHITECTURE__) +#define __ARCHITECTURE__ "m68k" +#endif + int version; + version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; + if (version < 4) + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + else + printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); + exit (0); +#endif + +#if defined (MULTIMAX) || defined (n16) +#if defined (UMAXV) + printf ("ns32k-encore-sysv\n"); exit (0); +#else +#if defined (CMU) + printf ("ns32k-encore-mach\n"); exit (0); +#else + printf ("ns32k-encore-bsd\n"); exit (0); +#endif +#endif +#endif + +#if defined (__386BSD__) + printf ("i386-pc-bsd\n"); exit (0); +#endif + +#if defined (sequent) +#if defined (i386) + printf ("i386-sequent-dynix\n"); exit (0); +#endif +#if defined (ns32000) + printf ("ns32k-sequent-dynix\n"); exit (0); +#endif +#endif + +#if defined (_SEQUENT_) + struct utsname un; + + uname(&un); + + if (strncmp(un.version, "V2", 2) == 0) { + printf ("i386-sequent-ptx2\n"); exit (0); + } + if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ + printf ("i386-sequent-ptx1\n"); exit (0); + } + printf ("i386-sequent-ptx\n"); exit (0); + +#endif + +#if defined (vax) +# if !defined (ultrix) +# include +# if defined (BSD) +# if BSD == 43 + printf ("vax-dec-bsd4.3\n"); exit (0); +# else +# if BSD == 199006 + printf ("vax-dec-bsd4.3reno\n"); exit (0); +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# endif +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# else + printf ("vax-dec-ultrix\n"); exit (0); +# endif +#endif + +#if defined (alliant) && defined (i860) + printf ("i860-alliant-bsd\n"); exit (0); +#endif + + exit (1); +} +EOF + +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } + +# Apollos put the system type in the environment. + +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } + +# Convex versions that predate uname can use getsysinfo(1) + +if [ -x /usr/convex/getsysinfo ] +then + case `getsysinfo -f cpu_type` in + c1*) + echo c1-convex-bsd + exit ;; + c2*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit ;; + c34*) + echo c34-convex-bsd + exit ;; + c38*) + echo c38-convex-bsd + exit ;; + c4*) + echo c4-convex-bsd + exit ;; + esac +fi + +cat >&2 < in order to provide the needed +information to handle your system. + +config.guess timestamp = $timestamp + +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null` + +hostinfo = `(hostinfo) 2>/dev/null` +/bin/universe = `(/bin/universe) 2>/dev/null` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` +/bin/arch = `(/bin/arch) 2>/dev/null` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` + +UNAME_MACHINE = ${UNAME_MACHINE} +UNAME_RELEASE = ${UNAME_RELEASE} +UNAME_SYSTEM = ${UNAME_SYSTEM} +UNAME_VERSION = ${UNAME_VERSION} +EOF + +exit 1 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff --git a/config/config.sub b/config/config.sub new file mode 100755 index 0000000000..bdda9e4a32 --- /dev/null +++ b/config/config.sub @@ -0,0 +1,1786 @@ +#! /bin/sh +# Configuration validation subroutine script. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. + +timestamp='2012-08-18' + +# This file is (in principle) common to ALL GNU software. +# The presence of a machine in this file suggests that SOME GNU software +# can handle that machine. It does not imply ALL GNU software can. +# +# This file is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, see . +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + + +# Please send patches to . Submit a context +# diff and a properly formatted GNU ChangeLog entry. +# +# Configuration subroutine to validate and canonicalize a configuration type. +# Supply the specified configuration type as an argument. +# If it is invalid, we print an error message on stderr and exit with code 1. +# Otherwise, we print the canonical config type on stdout and succeed. + +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + +# This file is supposed to be the same for all GNU packages +# and recognize all the CPU types, system types and aliases +# that are meaningful with *any* GNU software. +# Each package is responsible for reporting which valid configurations +# it does not support. The user should be able to distinguish +# a failure to support a valid configuration from a meaningless +# configuration. + +# The goal of this file is to map all the various variations of a given +# machine specification into a single specification in the form: +# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM +# or in some cases, the newer four-part form: +# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM +# It is wrong to echo any other type of specification. + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] CPU-MFR-OPSYS + $0 [OPTION] ALIAS + +Canonicalize a configuration name. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.sub ($timestamp) + +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" + exit 1 ;; + + *local*) + # First pass through any local machine types. + echo $1 + exit ;; + + * ) + break ;; + esac +done + +case $# in + 0) echo "$me: missing argument$help" >&2 + exit 1;; + 1) ;; + *) echo "$me: too many arguments$help" >&2 + exit 1;; +esac + +# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). +# Here we must recognize all the valid KERNEL-OS combinations. +maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` +case $maybe_os in + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; + *) + basic_machine=`echo $1 | sed 's/-[^-]*$//'` + if [ $basic_machine != $1 ] + then os=`echo $1 | sed 's/.*-/-/'` + else os=; fi + ;; +esac + +### Let's recognize common machines as not being operating systems so +### that things like config.sub decstation-3100 work. We also +### recognize some manufacturers as not being operating systems, so we +### can provide default operating systems below. +case $os in + -sun*os*) + # Prevent following clause from handling this invalid input. + ;; + -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ + -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ + -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ + -apple | -axis | -knuth | -cray | -microblaze) + os= + basic_machine=$1 + ;; + -bluegene*) + os=-cnk + ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 + ;; + -scout) + ;; + -wrs) + os=-vxworks + basic_machine=$1 + ;; + -chorusos*) + os=-chorusos + basic_machine=$1 + ;; + -chorusrdb) + os=-chorusrdb + basic_machine=$1 + ;; + -hiux*) + os=-hiuxwe2 + ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco5) + os=-sco3.2v5 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco4) + os=-sco3.2v4 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2.[4-9]*) + os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2v[4-9]*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco*) + os=-sco3.2v2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -udk*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -isc) + os=-isc2.2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -clix*) + basic_machine=clipper-intergraph + ;; + -isc*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; + -lynx*) + os=-lynxos + ;; + -ptx*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` + ;; + -windowsnt*) + os=`echo $os | sed -e 's/windowsnt/winnt/'` + ;; + -psos*) + os=-psos + ;; + -mint | -mint[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; +esac + +# Decode aliases for certain CPU-COMPANY combinations. +case $basic_machine in + # Recognize the basic CPU types without company name. + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ + | aarch64 | aarch64_be \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | be32 | be64 \ + | bfin \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ + | epiphany \ + | fido | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ + | le32 | le64 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ + | moxie \ + | mt \ + | msp430 \ + | nds32 | nds32le | nds32be \ + | nios | nios2 \ + | ns16k | ns32k \ + | open8 \ + | or32 \ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pyramid \ + | rl78 | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | ubicom32 \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | we32k \ + | x86 | xc16x | xstormy16 | xtensa \ + | z8k | z80) + basic_machine=$basic_machine-unknown + ;; + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + basic_machine=$basic_machine-unknown + os=-none + ;; + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) + ;; + ms1) + basic_machine=mt-unknown + ;; + + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. + i*86 | x86_64) + basic_machine=$basic_machine-pc + ;; + # Object if more than one company name word. + *-*-*) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ + | aarch64-* | aarch64_be-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ + | be32-* | be64-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ + | le32-* | le64-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ + | mips64octeon-* | mips64octeonel-* \ + | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ + | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pyramid-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile*-* \ + | tron-* \ + | ubicom32-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ + | we32k-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ + | xstormy16-* | xtensa*-* \ + | ymp-* \ + | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown + ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. + 386bsd) + basic_machine=i386-unknown + os=-bsd + ;; + 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) + basic_machine=m68000-att + ;; + 3b*) + basic_machine=we32k-att + ;; + a29khif) + basic_machine=a29k-amd + os=-udi + ;; + abacus) + basic_machine=abacus-unknown + ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout + ;; + alliant | fx80) + basic_machine=fx80-alliant + ;; + altos | altos3068) + basic_machine=m68k-altos + ;; + am29k) + basic_machine=a29k-none + os=-bsd + ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + amdahl) + basic_machine=580-amdahl + os=-sysv + ;; + amiga | amiga-*) + basic_machine=m68k-unknown + ;; + amigaos | amigados) + basic_machine=m68k-unknown + os=-amigaos + ;; + amigaunix | amix) + basic_machine=m68k-unknown + os=-sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + os=-sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + os=-bsd + ;; + aros) + basic_machine=i386-pc + os=-aros + ;; + aux) + basic_machine=m68k-apple + os=-aux + ;; + balance) + basic_machine=ns32k-sequent + os=-dynix + ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; + convex-c1) + basic_machine=c1-convex + os=-bsd + ;; + convex-c2) + basic_machine=c2-convex + os=-bsd + ;; + convex-c32) + basic_machine=c32-convex + os=-bsd + ;; + convex-c34) + basic_machine=c34-convex + os=-bsd + ;; + convex-c38) + basic_machine=c38-convex + os=-bsd + ;; + cray | j90) + basic_machine=j90-cray + os=-unicos + ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16 | cr16-*) + basic_machine=cr16-unknown + os=-elf + ;; + crds | unos) + basic_machine=m68k-crds + ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; + da30 | da30-*) + basic_machine=m68k-da30 + ;; + decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) + basic_machine=mips-dec + ;; + decsystem10* | dec10*) + basic_machine=pdp10-dec + os=-tops10 + ;; + decsystem20* | dec20*) + basic_machine=pdp10-dec + os=-tops20 + ;; + delta | 3300 | motorola-3300 | motorola-delta \ + | 3300-motorola | delta-motorola) + basic_machine=m68k-motorola + ;; + delta88) + basic_machine=m88k-motorola + os=-sysv3 + ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; + dpx20 | dpx20-*) + basic_machine=rs6000-bull + os=-bosx + ;; + dpx2* | dpx2*-bull) + basic_machine=m68k-bull + os=-sysv3 + ;; + ebmon29k) + basic_machine=a29k-amd + os=-ebmon + ;; + elxsi) + basic_machine=elxsi-elxsi + os=-bsd + ;; + encore | umax | mmax) + basic_machine=ns32k-encore + ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + os=-ose + ;; + fx2800) + basic_machine=i860-alliant + ;; + genix) + basic_machine=ns32k-ns + ;; + gmicro) + basic_machine=tron-gmicro + os=-sysv + ;; + go32) + basic_machine=i386-pc + os=-go32 + ;; + h3050r* | hiux*) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + h8300hms) + basic_machine=h8300-hitachi + os=-hms + ;; + h8300xray) + basic_machine=h8300-hitachi + os=-xray + ;; + h8500hms) + basic_machine=h8500-hitachi + os=-hms + ;; + harris) + basic_machine=m88k-harris + os=-sysv3 + ;; + hp300-*) + basic_machine=m68k-hp + ;; + hp300bsd) + basic_machine=m68k-hp + os=-bsd + ;; + hp300hpux) + basic_machine=m68k-hp + os=-hpux + ;; + hp3k9[0-9][0-9] | hp9[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k2[0-9][0-9] | hp9k31[0-9]) + basic_machine=m68000-hp + ;; + hp9k3[2-9][0-9]) + basic_machine=m68k-hp + ;; + hp9k6[0-9][0-9] | hp6[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k7[0-79][0-9] | hp7[0-79][0-9]) + basic_machine=hppa1.1-hp + ;; + hp9k78[0-9] | hp78[0-9]) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][13679] | hp8[0-9][13679]) + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][0-9] | hp8[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hppa-next) + os=-nextstep3 + ;; + hppaosf) + basic_machine=hppa1.1-hp + os=-osf + ;; + hppro) + basic_machine=hppa1.1-hp + os=-proelf + ;; + i370-ibm* | ibm*) + basic_machine=i370-ibm + ;; + i*86v32) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv32 + ;; + i*86v4*) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv4 + ;; + i*86v) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv + ;; + i*86sol2) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-solaris2 + ;; + i386mach) + basic_machine=i386-mach + os=-mach + ;; + i386-vsta | vsta) + basic_machine=i386-unknown + os=-vsta + ;; + iris | iris4d) + basic_machine=mips-sgi + case $os in + -irix*) + ;; + *) + os=-irix4 + ;; + esac + ;; + isi68 | isi) + basic_machine=m68k-isi + os=-sysv + ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + m88k-omron*) + basic_machine=m88k-omron + ;; + magnum | m3230) + basic_machine=mips-mips + os=-sysv + ;; + merlin) + basic_machine=ns32k-utek + os=-sysv + ;; + microblaze) + basic_machine=microblaze-xilinx + ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; + mingw32) + basic_machine=i386-pc + os=-mingw32 + ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; + miniframe) + basic_machine=m68000-convergent + ;; + *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; + mips3*-*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` + ;; + mips3*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown + ;; + monitor) + basic_machine=m68k-rom68k + os=-coff + ;; + morphos) + basic_machine=powerpc-unknown + os=-morphos + ;; + msdos) + basic_machine=i386-pc + os=-msdos + ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; + msys) + basic_machine=i386-pc + os=-msys + ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 + ;; + netbsd386) + basic_machine=i386-unknown + os=-netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + os=-linux + ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + os=-newsos + ;; + news1000) + basic_machine=m68030-sony + os=-newsos + ;; + news-3600 | risc-news) + basic_machine=mips-sony + os=-newsos + ;; + necv70) + basic_machine=v70-nec + os=-sysv + ;; + next | m*-next ) + basic_machine=m68k-next + case $os in + -nextstep* ) + ;; + -ns2*) + os=-nextstep2 + ;; + *) + os=-nextstep3 + ;; + esac + ;; + nh3000) + basic_machine=m68k-harris + os=-cxux + ;; + nh[45]000) + basic_machine=m88k-harris + os=-cxux + ;; + nindy960) + basic_machine=i960-intel + os=-nindy + ;; + mon960) + basic_machine=i960-intel + os=-mon960 + ;; + nonstopux) + basic_machine=mips-compaq + os=-nonstopux + ;; + np1) + basic_machine=np1-gould + ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; + op50n-* | op60c-*) + basic_machine=hppa1.1-oki + os=-proelf + ;; + openrisc | openrisc-*) + basic_machine=or32-unknown + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=-ose + ;; + os68k) + basic_machine=m68k-none + os=-os68k + ;; + pa-hitachi) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + paragon) + basic_machine=i860-intel + os=-osf + ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + pbd) + basic_machine=sparc-tti + ;; + pbb) + basic_machine=m68k-tti + ;; + pc532 | pc532-*) + basic_machine=ns32k-pc532 + ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium | p5 | k5 | k6 | nexgen | viac3) + basic_machine=i586-pc + ;; + pentiumpro | p6 | 6x86 | athlon | athlon_*) + basic_machine=i686-pc + ;; + pentiumii | pentium2 | pentiumiii | pentium3) + basic_machine=i686-pc + ;; + pentium4) + basic_machine=i786-pc + ;; + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) + basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumpro-* | p6-* | 6x86-* | athlon-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium4-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pn) + basic_machine=pn-gould + ;; + power) basic_machine=power-ibm + ;; + ppc | ppcbe) basic_machine=powerpc-unknown + ;; + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle | ppc-le | powerpc-little) + basic_machine=powerpcle-unknown + ;; + ppcle-* | powerpclittle-*) + basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64) basic_machine=powerpc64-unknown + ;; + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64le | powerpc64little | ppc64-le | powerpc64-little) + basic_machine=powerpc64le-unknown + ;; + ppc64le-* | powerpc64little-*) + basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ps2) + basic_machine=i386-ibm + ;; + pw32) + basic_machine=i586-unknown + os=-pw32 + ;; + rdos) + basic_machine=i386-pc + os=-rdos + ;; + rom68k) + basic_machine=m68k-rom68k + os=-coff + ;; + rm[46]00) + basic_machine=mips-siemens + ;; + rtpc | rtpc-*) + basic_machine=romp-ibm + ;; + s390 | s390-*) + basic_machine=s390-ibm + ;; + s390x | s390x-*) + basic_machine=s390x-ibm + ;; + sa29200) + basic_machine=a29k-amd + os=-udi + ;; + sb1) + basic_machine=mipsisa64sb1-unknown + ;; + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; + sequent) + basic_machine=i386-sequent + ;; + sh) + basic_machine=sh-hitachi + os=-hms + ;; + sh5el) + basic_machine=sh5le-unknown + ;; + sh64) + basic_machine=sh64-unknown + ;; + sparclite-wrs | simso-wrs) + basic_machine=sparclite-wrs + os=-vxworks + ;; + sps7) + basic_machine=m68k-bull + os=-sysv2 + ;; + spur) + basic_machine=spur-unknown + ;; + st2000) + basic_machine=m68k-tandem + ;; + stratus) + basic_machine=i860-stratus + os=-sysv4 + ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + sun2) + basic_machine=m68000-sun + ;; + sun2os3) + basic_machine=m68000-sun + os=-sunos3 + ;; + sun2os4) + basic_machine=m68000-sun + os=-sunos4 + ;; + sun3os3) + basic_machine=m68k-sun + os=-sunos3 + ;; + sun3os4) + basic_machine=m68k-sun + os=-sunos4 + ;; + sun4os3) + basic_machine=sparc-sun + os=-sunos3 + ;; + sun4os4) + basic_machine=sparc-sun + os=-sunos4 + ;; + sun4sol2) + basic_machine=sparc-sun + os=-solaris2 + ;; + sun3 | sun3-*) + basic_machine=m68k-sun + ;; + sun4) + basic_machine=sparc-sun + ;; + sun386 | sun386i | roadrunner) + basic_machine=i386-sun + ;; + sv1) + basic_machine=sv1-cray + os=-unicos + ;; + symmetry) + basic_machine=i386-sequent + os=-dynix + ;; + t3e) + basic_machine=alphaev5-cray + os=-unicos + ;; + t90) + basic_machine=t90-cray + os=-unicos + ;; + tile*) + basic_machine=$basic_machine-unknown + os=-linux-gnu + ;; + tx39) + basic_machine=mipstx39-unknown + ;; + tx39el) + basic_machine=mipstx39el-unknown + ;; + toad1) + basic_machine=pdp10-xkl + os=-tops20 + ;; + tower | tower-32) + basic_machine=m68k-ncr + ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; + udi29k) + basic_machine=a29k-amd + os=-udi + ;; + ultra3) + basic_machine=a29k-nyu + os=-sym1 + ;; + v810 | necv810) + basic_machine=v810-nec + os=-none + ;; + vaxv) + basic_machine=vax-dec + os=-sysv + ;; + vms) + basic_machine=vax-dec + os=-vms + ;; + vpp*|vx|vx-*) + basic_machine=f301-fujitsu + ;; + vxworks960) + basic_machine=i960-wrs + os=-vxworks + ;; + vxworks68) + basic_machine=m68k-wrs + os=-vxworks + ;; + vxworks29k) + basic_machine=a29k-wrs + os=-vxworks + ;; + w65*) + basic_machine=w65-wdc + os=-none + ;; + w89k-*) + basic_machine=hppa1.1-winbond + os=-proelf + ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; + xps | xps100) + basic_machine=xps100-honeywell + ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; + ymp) + basic_machine=ymp-cray + os=-unicos + ;; + z8k-*-coff) + basic_machine=z8k-unknown + os=-sim + ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; + none) + basic_machine=none-none + os=-none + ;; + +# Here we handle the default manufacturer of certain CPU types. It is in +# some cases the only manufacturer, in others, it is the most popular. + w89k) + basic_machine=hppa1.1-winbond + ;; + op50n) + basic_machine=hppa1.1-oki + ;; + op60c) + basic_machine=hppa1.1-oki + ;; + romp) + basic_machine=romp-ibm + ;; + mmix) + basic_machine=mmix-knuth + ;; + rs6000) + basic_machine=rs6000-ibm + ;; + vax) + basic_machine=vax-dec + ;; + pdp10) + # there are many clones, so DEC is not a safe bet + basic_machine=pdp10-unknown + ;; + pdp11) + basic_machine=pdp11-dec + ;; + we32k) + basic_machine=we32k-att + ;; + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) + basic_machine=sparc-sun + ;; + cydra) + basic_machine=cydra-cydrome + ;; + orion) + basic_machine=orion-highlevel + ;; + orion105) + basic_machine=clipper-highlevel + ;; + mac | mpw | mac-mpw) + basic_machine=m68k-apple + ;; + pmac | pmac-mpw) + basic_machine=powerpc-apple + ;; + *-unknown) + # Make sure to match an already-canonicalized machine name. + ;; + *) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; +esac + +# Here we canonicalize certain aliases for manufacturers. +case $basic_machine in + *-digital*) + basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` + ;; + *-commodore*) + basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` + ;; + *) + ;; +esac + +# Decode manufacturer-specific aliases for certain operating systems. + +if [ x"$os" != x"" ] +then +case $os in + # First match some system type aliases + # that might get confused with valid system types. + # -solaris* is a basic system type, with this one exception. + -auroraux) + os=-auroraux + ;; + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` + ;; + -solaris) + os=-solaris2 + ;; + -svr4*) + os=-sysv4 + ;; + -unixware*) + os=-sysv4.2uw + ;; + -gnu/linux*) + os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` + ;; + # First accept the basic system types. + # The portable systems comes first. + # Each alternative MUST END IN A *, to match a version number. + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ + | -sym* | -kopensolaris* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ + | -aos* | -aros* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) + case $basic_machine in + x86-* | i*86-*) + ;; + *) + os=-nto$os + ;; + esac + ;; + -nto-qnx*) + ;; + -nto*) + os=`echo $os | sed -e 's|nto|nto-qnx|'` + ;; + -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + ;; + -mac*) + os=`echo $os | sed -e 's|mac|macos|'` + ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; + -linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` + ;; + -sunos5*) + os=`echo $os | sed -e 's|sunos5|solaris2|'` + ;; + -sunos6*) + os=`echo $os | sed -e 's|sunos6|solaris3|'` + ;; + -opened*) + os=-openedition + ;; + -os400*) + os=-os400 + ;; + -wince*) + os=-wince + ;; + -osfrose*) + os=-osfrose + ;; + -osf*) + os=-osf + ;; + -utek*) + os=-bsd + ;; + -dynix*) + os=-bsd + ;; + -acis*) + os=-aos + ;; + -atheos*) + os=-atheos + ;; + -syllable*) + os=-syllable + ;; + -386bsd) + os=-bsd + ;; + -ctix* | -uts*) + os=-sysv + ;; + -nova*) + os=-rtmk-nova + ;; + -ns2 ) + os=-nextstep2 + ;; + -nsk*) + os=-nsk + ;; + # Preserve the version number of sinix5. + -sinix5.*) + os=`echo $os | sed -e 's|sinix|sysv|'` + ;; + -sinix*) + os=-sysv4 + ;; + -tpf*) + os=-tpf + ;; + -triton*) + os=-sysv3 + ;; + -oss*) + os=-sysv3 + ;; + -svr4) + os=-sysv4 + ;; + -svr3) + os=-sysv3 + ;; + -sysvr4) + os=-sysv4 + ;; + # This must come after -sysvr4. + -sysv*) + ;; + -ose*) + os=-ose + ;; + -es1800*) + os=-ose + ;; + -xenix) + os=-xenix + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + os=-mint + ;; + -aros*) + os=-aros + ;; + -kaos*) + os=-kaos + ;; + -zvmoe) + os=-zvmoe + ;; + -dicos*) + os=-dicos + ;; + -nacl*) + ;; + -none) + ;; + *) + # Get rid of the `-' at the beginning of $os. + os=`echo $os | sed 's/[^-]*-//'` + echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 + exit 1 + ;; +esac +else + +# Here we handle the default operating systems that come with various machines. +# The value should be what the vendor currently ships out the door with their +# machine or put another way, the most popular os provided with the machine. + +# Note that if you're going to try to match "-MANUFACTURER" here (say, +# "-sun"), then you have to tell the case statement up towards the top +# that MANUFACTURER isn't an operating system. Otherwise, code above +# will signal an error saying that MANUFACTURER isn't an operating +# system, and we'll never get to this point. + +case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; + *-acorn) + os=-riscix1.2 + ;; + arm*-rebel) + os=-linux + ;; + arm*-semi) + os=-aout + ;; + c4x-* | tic4x-*) + os=-coff + ;; + hexagon-*) + os=-elf + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff + ;; + # This must come before the *-dec entry. + pdp10-*) + os=-tops20 + ;; + pdp11-*) + os=-none + ;; + *-dec | vax-*) + os=-ultrix4.2 + ;; + m68*-apollo) + os=-domain + ;; + i386-sun) + os=-sunos4.0.2 + ;; + m68000-sun) + os=-sunos3 + ;; + m68*-cisco) + os=-aout + ;; + mep-*) + os=-elf + ;; + mips*-cisco) + os=-elf + ;; + mips*-*) + os=-elf + ;; + or32-*) + os=-coff + ;; + *-tti) # must be before sparc entry or we get the wrong os. + os=-sysv3 + ;; + sparc-* | *-sun) + os=-sunos4.1.1 + ;; + *-be) + os=-beos + ;; + *-haiku) + os=-haiku + ;; + *-ibm) + os=-aix + ;; + *-knuth) + os=-mmixware + ;; + *-wec) + os=-proelf + ;; + *-winbond) + os=-proelf + ;; + *-oki) + os=-proelf + ;; + *-hp) + os=-hpux + ;; + *-hitachi) + os=-hiux + ;; + i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) + os=-sysv + ;; + *-cbm) + os=-amigaos + ;; + *-dg) + os=-dgux + ;; + *-dolphin) + os=-sysv3 + ;; + m68k-ccur) + os=-rtu + ;; + m88k-omron*) + os=-luna + ;; + *-next ) + os=-nextstep + ;; + *-sequent) + os=-ptx + ;; + *-crds) + os=-unos + ;; + *-ns) + os=-genix + ;; + i370-*) + os=-mvs + ;; + *-next) + os=-nextstep3 + ;; + *-gould) + os=-sysv + ;; + *-highlevel) + os=-bsd + ;; + *-encore) + os=-bsd + ;; + *-sgi) + os=-irix + ;; + *-siemens) + os=-sysv4 + ;; + *-masscomp) + os=-rtu + ;; + f30[01]-fujitsu | f700-fujitsu) + os=-uxpv + ;; + *-rom68k) + os=-coff + ;; + *-*bug) + os=-coff + ;; + *-apple) + os=-macos + ;; + *-atari*) + os=-mint + ;; + *) + os=-none + ;; +esac +fi + +# Here we handle the case where we know the os, and the CPU type, but not the +# manufacturer. We pick the logical manufacturer. +vendor=unknown +case $basic_machine in + *-unknown) + case $os in + -riscix*) + vendor=acorn + ;; + -sunos*) + vendor=sun + ;; + -cnk*|-aix*) + vendor=ibm + ;; + -beos*) + vendor=be + ;; + -hpux*) + vendor=hp + ;; + -mpeix*) + vendor=hp + ;; + -hiux*) + vendor=hitachi + ;; + -unos*) + vendor=crds + ;; + -dgux*) + vendor=dg + ;; + -luna*) + vendor=omron + ;; + -genix*) + vendor=ns + ;; + -mvs* | -opened*) + vendor=ibm + ;; + -os400*) + vendor=ibm + ;; + -ptx*) + vendor=sequent + ;; + -tpf*) + vendor=ibm + ;; + -vxsim* | -vxworks* | -windiss*) + vendor=wrs + ;; + -aux*) + vendor=apple + ;; + -hms*) + vendor=hitachi + ;; + -mpw* | -macos*) + vendor=apple + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + vendor=atari + ;; + -vos*) + vendor=stratus + ;; + esac + basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` + ;; +esac + +echo $basic_machine$os +exit + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff --git a/config/install-sh b/config/install-sh new file mode 100755 index 0000000000..377bb8687f --- /dev/null +++ b/config/install-sh @@ -0,0 +1,527 @@ +#!/bin/sh +# install - install a program, script, or datafile + +scriptversion=2011-11-20.07; # UTC + +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. +# +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. +# +# Calling this script install-sh is preferred over install.sh, to prevent +# 'make' implicit rules from creating a file called install from it +# when there is no Makefile. +# +# This script is compatible with the BSD install script, but was written +# from scratch. + +nl=' +' +IFS=" "" $nl" + +# set DOITPROG to echo to test this script + +# Don't use :- since 4.3BSD and earlier shells don't like it. +doit=${DOITPROG-} +if test -z "$doit"; then + doit_exec=exec +else + doit_exec=$doit +fi + +# Put in absolute file names if you don't have them in your path; +# or use environment vars. + +chgrpprog=${CHGRPPROG-chgrp} +chmodprog=${CHMODPROG-chmod} +chownprog=${CHOWNPROG-chown} +cmpprog=${CMPPROG-cmp} +cpprog=${CPPROG-cp} +mkdirprog=${MKDIRPROG-mkdir} +mvprog=${MVPROG-mv} +rmprog=${RMPROG-rm} +stripprog=${STRIPPROG-strip} + +posix_glob='?' +initialize_posix_glob=' + test "$posix_glob" != "?" || { + if (set -f) 2>/dev/null; then + posix_glob= + else + posix_glob=: + fi + } +' + +posix_mkdir= + +# Desired mode of installed file. +mode=0755 + +chgrpcmd= +chmodcmd=$chmodprog +chowncmd= +mvcmd=$mvprog +rmcmd="$rmprog -f" +stripcmd= + +src= +dst= +dir_arg= +dst_arg= + +copy_on_change=false +no_target_directory= + +usage="\ +Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... + +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. + +Options: + --help display this help and exit. + --version display version info and exit. + + -c (ignored) + -C install only if different (preserve the last data modification time) + -d create directories instead of installing files. + -g GROUP $chgrpprog installed files to GROUP. + -m MODE $chmodprog installed files to MODE. + -o USER $chownprog installed files to USER. + -s $stripprog installed files. + -t DIRECTORY install into DIRECTORY. + -T report an error if DSTFILE is a directory. + +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG + RMPROG STRIPPROG +" + +while test $# -ne 0; do + case $1 in + -c) ;; + + -C) copy_on_change=true;; + + -d) dir_arg=true;; + + -g) chgrpcmd="$chgrpprog $2" + shift;; + + --help) echo "$usage"; exit $?;; + + -m) mode=$2 + case $mode in + *' '* | *' '* | *' +'* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; + + -o) chowncmd="$chownprog $2" + shift;; + + -s) stripcmd=$stripprog;; + + -t) dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; + + -T) no_target_directory=true;; + + --version) echo "$0 $scriptversion"; exit $?;; + + --) shift + break;; + + -*) echo "$0: invalid option: $1" >&2 + exit 1;; + + *) break;; + esac + shift +done + +if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then + # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dst_arg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dst_arg" + shift # fnord + fi + shift # arg + dst_arg=$arg + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + done +fi + +if test $# -eq 0; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call 'install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 +fi + +if test -z "$dir_arg"; then + do_exit='(exit $ret); exit $ret' + trap "ret=129; $do_exit" 1 + trap "ret=130; $do_exit" 2 + trap "ret=141; $do_exit" 13 + trap "ret=143; $do_exit" 15 + + # Set umask so as not to create temps with too-generous modes. + # However, 'strip' requires both read and write access to temps. + case $mode in + # Optimize common cases. + *644) cp_umask=133;; + *755) cp_umask=22;; + + *[0-7]) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw='% 200' + fi + cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; + *) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw=,u+rw + fi + cp_umask=$mode$u_plus_rw;; + esac +fi + +for src +do + # Protect names problematic for 'test' and other utilities. + case $src in + -* | [=\(\)!]) src=./$src;; + esac + + if test -n "$dir_arg"; then + dst=$src + dstdir=$dst + test -d "$dstdir" + dstdir_status=$? + else + + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi + + if test -z "$dst_arg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + dst=$dst_arg + + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test -n "$no_target_directory"; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 + fi + dstdir=$dst + dst=$dstdir/`basename "$src"` + dstdir_status=0 + else + # Prefer dirname, but fall back on a substitute if dirname fails. + dstdir=` + (dirname "$dst") 2>/dev/null || + expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$dst" : 'X\(//\)[^/]' \| \ + X"$dst" : 'X\(//\)$' \| \ + X"$dst" : 'X\(/\)' \| . 2>/dev/null || + echo X"$dst" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q' + ` + + test -d "$dstdir" + dstdir_status=$? + fi + fi + + obsolete_mkdir_used=false + + if test $dstdir_status != 0; then + case $posix_mkdir in + '') + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + + if (umask $mkdir_umask && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + ls_ld_tmpdir=`ls -ld "$tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/d" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + fi + trap '' 0;; + esac;; + esac + + if + $posix_mkdir && ( + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + ) + then : + else + + # The umask is ridiculous, or mkdir does not conform to POSIX, + # or it failed possibly due to a race condition. Create the + # directory the slow way, step by step, checking for races as we go. + + case $dstdir in + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; + esac + + eval "$initialize_posix_glob" + + oIFS=$IFS + IFS=/ + $posix_glob set -f + set fnord $dstdir + shift + $posix_glob set +f + IFS=$oIFS + + prefixes= + + for d + do + test X"$d" = X && continue + + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ + done + + if test -n "$prefixes"; then + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true + fi + fi + fi + + if test -n "$dir_arg"; then + { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && + { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || + test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 + else + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + + # Copy the file name to the temp name. + (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && + { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && + { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && + + # If -C, don't bother to copy if it wouldn't change the file. + if $copy_on_change && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + + eval "$initialize_posix_glob" && + $posix_glob set -f && + set X $old && old=:$2:$4:$5:$6 && + set X $new && new=:$2:$4:$5:$6 && + $posix_glob set +f && + + test "$old" = "$new" && + $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 + then + rm -f "$dsttmp" + else + # Rename the file to the real destination. + $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || + + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + { + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" + } + fi || exit 1 + + trap '' 0 + fi +done + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: From cac06ed0a4b63bab62ba7629584db602222131f2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 25 Nov 2013 11:26:51 +0000 Subject: [PATCH 36/89] Remove obsolete setting of $CC_FOR_BUILD --- configure.ac | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/configure.ac b/configure.ac index 7028e5f9f4..57c294d9eb 100644 --- a/configure.ac +++ b/configure.ac @@ -59,16 +59,6 @@ CXXFLAGS=${CXXFLAGS:--g -O3 -Wall} AC_PROG_CC AC_PROG_CXX -# To build programs to be run in the build machine. -if test "$CC_FOR_BUILD" = ""; then - if test "$cross_compiling" = "yes"; then - AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc) - else - CC_FOR_BUILD="$CC" - fi -fi -AC_SUBST([CC_FOR_BUILD]) - # Use 64-bit file system calls so that we can support files > 2 GiB. AC_SYS_LARGEFILE From 784feb68392ec4a0bdd45bf0d37f08c3eb1b61ac Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 25 Nov 2013 11:29:13 +0000 Subject: [PATCH 37/89] =?UTF-8?q?Let=20=E2=80=98make=20clean=E2=80=99=20de?= =?UTF-8?q?lete=20instantiated=20template=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mk/templates.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mk/templates.mk b/mk/templates.mk index 3575b6d956..09bae50e8a 100644 --- a/mk/templates.mk +++ b/mk/templates.mk @@ -5,4 +5,6 @@ define instantiate-template = $(1): $(1).in ./config.status --file $(1) + clean_files += $(1) + endef From 1a1d8b073a1d770c8de4f8eb274387b209b32782 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 25 Nov 2013 11:39:21 +0000 Subject: [PATCH 38/89] Add a Makefile for bsdiff --- Makefile.config.in | 1 + Makefile.new | 1 + mk/programs.mk | 5 +++-- src/bsdiff-4.3/Makefile.new | 13 +++++++++++++ 4 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 src/bsdiff-4.3/Makefile.new diff --git a/Makefile.config.in b/Makefile.config.in index 48baa28894..b9d9bd1c46 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -9,6 +9,7 @@ OPENSSL_LIBS = @OPENSSL_LIBS@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ bindir = @bindir@ +bsddiff_compat_include = @bsddiff_compat_include@ datadir = @datadir@ datarootdir = @datarootdir@ exec_prefix = @exec_prefix@ diff --git a/Makefile.new b/Makefile.new index ed090a1f47..b3ff2fc1b4 100644 --- a/Makefile.new +++ b/Makefile.new @@ -10,6 +10,7 @@ SUBS = \ src/nix-env/Makefile.new \ src/nix-daemon/Makefile.new \ src/nix-log2xml/Makefile.new \ + src/bsdiff-4.3/Makefile.new \ corepkgs/Makefile.new GLOBAL_CXXFLAGS = -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr diff --git a/mk/programs.mk b/mk/programs.mk index e26e9af7a3..48f95c60c9 100644 --- a/mk/programs.mk +++ b/mk/programs.mk @@ -13,7 +13,8 @@ programs_list := # # - $(1)_LDFLAGS: additional linker flags. # -# - bindir: the directory where the program will be installed. +# - $(1)_INSTALL_DIR: the directory where the program will be +# installed; defaults to $(bindir). define build-program = _d := $$($(1)_DIR) _srcs := $$(foreach src, $$($(1)_SOURCES), $$(_d)/$$(src)) @@ -24,7 +25,7 @@ define build-program = $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) $(QUIET) $(CXX) -o $$@ $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) - $(1)_INSTALL_DIR := $$(bindir) + $(1)_INSTALL_DIR ?= $$(bindir) $(1)_INSTALL_PATH := $$($(1)_INSTALL_DIR)/$(1) $$(eval $$(call create-dir,$$($(1)_INSTALL_DIR))) diff --git a/src/bsdiff-4.3/Makefile.new b/src/bsdiff-4.3/Makefile.new new file mode 100644 index 0000000000..a56f6c124d --- /dev/null +++ b/src/bsdiff-4.3/Makefile.new @@ -0,0 +1,13 @@ +PROGRAMS += bsdiff bspatch + +bsdiff_DIR := $(d) +bsdiff_SOURCES = bsdiff.c +bsdiff_LDFLAGS = -lbz2 $(bsddiff_compat_include) +bsdiff_INSTALL_DIR = $(libexecdir) + +bspatch_DIR := $(d) +bspatch_SOURCES = bspatch.c +bspatch_LDFLAGS = -lbz2 $(bsddiff_compat_include) +bspatch_INSTALL_DIR = $(libexecdir) + +dist_files += $(d)/compat-include/* From 962551a071da87589a97a2f40d72b87d6e6ba9e2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 25 Nov 2013 15:05:56 +0000 Subject: [PATCH 39/89] Add a Makefile for the scripts directory --- Makefile.new | 1 + corepkgs/Makefile.new | 2 +- mk/install.mk | 46 ++++++++++++++++++++++++++++++++++++------- mk/lib.mk | 9 +++++++++ mk/programs.mk | 2 +- mk/templates.mk | 6 +++--- scripts/Makefile.new | 39 ++++++++++++++++++++++++++++++++++++ 7 files changed, 93 insertions(+), 12 deletions(-) create mode 100644 scripts/Makefile.new diff --git a/Makefile.new b/Makefile.new index b3ff2fc1b4..d63fa3ace3 100644 --- a/Makefile.new +++ b/Makefile.new @@ -11,6 +11,7 @@ SUBS = \ src/nix-daemon/Makefile.new \ src/nix-log2xml/Makefile.new \ src/bsdiff-4.3/Makefile.new \ + scripts/Makefile.new \ corepkgs/Makefile.new GLOBAL_CXXFLAGS = -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr diff --git a/corepkgs/Makefile.new b/corepkgs/Makefile.new index 5b500a679a..a04e3e3fbc 100644 --- a/corepkgs/Makefile.new +++ b/corepkgs/Makefile.new @@ -1,5 +1,5 @@ corepkgs_FILES = nar.nix buildenv.nix buildenv.pl unpack-channel.nix derivation.nix fetchurl.nix imported-drv-to-derivation.nix -$(foreach file,config.nix $(corepkgs_FILES),$(eval $(call install-file-in,$(datadir)/nix/corepkgs,$(d)/$(file)))) +$(foreach file,config.nix $(corepkgs_FILES),$(eval $(call install-data-in,$(d)/$(file),$(datadir)/nix/corepkgs))) template_files += $(d)/config.nix diff --git a/mk/install.mk b/mk/install.mk index 64fc6a696a..d6e75d2bfb 100644 --- a/mk/install.mk +++ b/mk/install.mk @@ -9,15 +9,47 @@ define create-dir = endef -# Add a rule for installing file $(2) in directory $(1). The -# directory will be created automatically. -define install-file-in = +# Add a rule for installing file $(1) as file $(2) with mode $(3). +# The directory containing $(2) will be created automatically. +define install-file-as = - install:: $(1)/$(notdir $(2)) + install: $(2) - $$(eval $$(call create-dir,$(1))) + $$(eval $$(call create-dir,$$(dir $(2)))) - $(1)/$(notdir $(2)): $(2) | $(1) - $(QUIET) install -t $(1) $(2) + $(2): $(1) | $$(dir $(2)) + $(QUIET) install -m $(3) $(1) $(2) endef + + +# Add a rule for installing file $(1) in directory $(2) with mode +# $(3). The directory will be created automatically. +define install-file-in = + $$(eval $$(call install-file-as,$(1),$(2)/$$(notdir $(1)),$(3))) +endef + + +define install-program-in = + $$(eval $$(call install-file-in,$(1),$(2),0755)) +endef + + +define install-data-in = + $$(eval $$(call install-file-in,$(1),$(2),0644)) +endef + + +# Install a symlink from $(2) to $(1). Note that $(1) need not exist. +define install-symlink = + + install: $(2) + + $$(eval $$(call create-dir,$$(dir $(2)))) + + $(2): | $$(dir $(2)) + ln -sfn $(1) $(2) + +endef + + diff --git a/mk/lib.mk b/mk/lib.mk index b4a2fb265c..a1634bc002 100644 --- a/mk/lib.mk +++ b/mk/lib.mk @@ -6,8 +6,14 @@ template_files += Makefile.config include Makefile.config +# Get rid of default suffixes. FIXME: is this a good idea? +.SUFFIXES: + + # Initialise some variables. QUIET = @ +bin_SCRIPTS := +noinst_SCRIPTS := # Pass -fPIC if we're building dynamic libraries. @@ -46,6 +52,9 @@ $(foreach mf, $(SUBS), $(eval $(call include-sub-makefile, $(mf)))) # Instantiate stuff. $(foreach lib, $(LIBS), $(eval $(call build-library,$(lib)))) $(foreach prog, $(PROGRAMS), $(eval $(call build-program,$(prog)))) +$(foreach script, $(bin_SCRIPTS), $(eval $(call install-program-in,$(script),$(bindir)))) +$(foreach script, $(bin_SCRIPTS), $(eval programs_list += $(script))) +$(foreach script, $(noinst_SCRIPTS), $(eval programs_list += $(script))) $(foreach template, $(template_files), $(eval $(call instantiate-template,$(template)))) diff --git a/mk/programs.mk b/mk/programs.mk index 48f95c60c9..648a6053b4 100644 --- a/mk/programs.mk +++ b/mk/programs.mk @@ -30,7 +30,7 @@ define build-program = $$(eval $$(call create-dir,$$($(1)_INSTALL_DIR))) - install:: $$($(1)_INSTALL_PATH) + install: $$($(1)_INSTALL_PATH) ifeq ($(BUILD_SHARED_LIBS), 1) diff --git a/mk/templates.mk b/mk/templates.mk index 09bae50e8a..fa91e25095 100644 --- a/mk/templates.mk +++ b/mk/templates.mk @@ -2,9 +2,9 @@ # substitutes all ‘@var@’ variables set by the configure script). define instantiate-template = - $(1): $(1).in - ./config.status --file $(1) - clean_files += $(1) endef + +%: %.in + $(QUIET) ./config.status --quiet --file $@ diff --git a/scripts/Makefile.new b/scripts/Makefile.new new file mode 100644 index 0000000000..2805128db8 --- /dev/null +++ b/scripts/Makefile.new @@ -0,0 +1,39 @@ +nix_bin_scripts := \ + $(d)/nix-build \ + $(d)/nix-channel \ + $(d)/nix-collect-garbage \ + $(d)/nix-copy-closure \ + $(d)/nix-generate-patches \ + $(d)/nix-install-package \ + $(d)/nix-prefetch-url \ + $(d)/nix-pull \ + $(d)/nix-push + +bin_SCRIPTS += $(nix_bin_scripts) + +nix_substituters := \ + $(d)/copy-from-other-stores.pl \ + $(d)/download-from-binary-cache.pl \ + $(d)/download-using-manifests.pl + +nix_noinst_scripts := \ + $(d)/build-remote.pl \ + $(d)/find-runtime-roots.pl \ + $(d)/nix-http-export.cgi \ + $(d)/nix-profile.sh \ + $(d)/nix-reduce-build \ + $(nix_substituters) + +noinst_SCRIPTS += $(nix_noinst_scripts) + +profiledir = $(sysconfdir)/profile.d + +$(eval $(call install-file-as, $(d)/nix-profile.sh, $(profiledir)/nix.sh, 0644)) +$(eval $(call install-program-in, $(d)/find-runtime-roots.pl, $(libexecdir)/nix)) +$(eval $(call install-program-in, $(d)/build-remote.pl, $(libexecdir)/nix)) +$(foreach prog, $(nix_substituters), $(eval $(call install-program-in, $(prog), $(libexecdir)/nix/substituters))) +$(eval $(call install-symlink, nix-build, $(bindir)/nix-shell)) + +clean_files += $(nix_bin_scripts) $(nix_noinst_scripts) + +dist_files += $(d)/*.in From 7ce0e05ad875657a0fec10e192454b837146e190 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 25 Nov 2013 15:25:13 +0000 Subject: [PATCH 40/89] Rename Makefile.new -> Makefile --- .gitignore | 2 -- Makefile | 19 +++++++++++++++++++ Makefile.new | 19 ------------------- corepkgs/{Makefile.new => Makefile} | 0 mk/install.mk | 2 +- scripts/{Makefile.new => Makefile} | 0 src/boost/format/{Makefile.new => Makefile} | 0 src/bsdiff-4.3/{Makefile.new => Makefile} | 0 src/libexpr/{Makefile.new => Makefile} | 0 src/libmain/{Makefile.new => Makefile} | 0 src/libstore/{Makefile.new => Makefile} | 0 src/libutil/{Makefile.new => Makefile} | 0 src/nix-daemon/{Makefile.new => Makefile} | 0 src/nix-env/{Makefile.new => Makefile} | 0 src/nix-hash/{Makefile.new => Makefile} | 0 .../{Makefile.new => Makefile} | 0 src/nix-log2xml/{Makefile.new => Makefile} | 0 src/nix-store/{Makefile.new => Makefile} | 0 18 files changed, 20 insertions(+), 22 deletions(-) create mode 100644 Makefile delete mode 100644 Makefile.new rename corepkgs/{Makefile.new => Makefile} (100%) rename scripts/{Makefile.new => Makefile} (100%) rename src/boost/format/{Makefile.new => Makefile} (100%) rename src/bsdiff-4.3/{Makefile.new => Makefile} (100%) rename src/libexpr/{Makefile.new => Makefile} (100%) rename src/libmain/{Makefile.new => Makefile} (100%) rename src/libstore/{Makefile.new => Makefile} (100%) rename src/libutil/{Makefile.new => Makefile} (100%) rename src/nix-daemon/{Makefile.new => Makefile} (100%) rename src/nix-env/{Makefile.new => Makefile} (100%) rename src/nix-hash/{Makefile.new => Makefile} (100%) rename src/nix-instantiate/{Makefile.new => Makefile} (100%) rename src/nix-log2xml/{Makefile.new => Makefile} (100%) rename src/nix-store/{Makefile.new => Makefile} (100%) diff --git a/.gitignore b/.gitignore index 961877ada3..fafe8a17a4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,3 @@ -Makefile -Makefile.in Makefile.config # / diff --git a/Makefile b/Makefile new file mode 100644 index 0000000000..652085a781 --- /dev/null +++ b/Makefile @@ -0,0 +1,19 @@ +SUBS = \ + src/boost/format/Makefile \ + src/libutil/Makefile \ + src/libstore/Makefile \ + src/libmain/Makefile \ + src/libexpr/Makefile \ + src/nix-hash/Makefile \ + src/nix-store/Makefile \ + src/nix-instantiate/Makefile \ + src/nix-env/Makefile \ + src/nix-daemon/Makefile \ + src/nix-log2xml/Makefile \ + src/bsdiff-4.3/Makefile \ + scripts/Makefile \ + corepkgs/Makefile + +GLOBAL_CXXFLAGS = -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr + +include mk/lib.mk diff --git a/Makefile.new b/Makefile.new deleted file mode 100644 index d63fa3ace3..0000000000 --- a/Makefile.new +++ /dev/null @@ -1,19 +0,0 @@ -SUBS = \ - src/boost/format/Makefile.new \ - src/libutil/Makefile.new \ - src/libstore/Makefile.new \ - src/libmain/Makefile.new \ - src/libexpr/Makefile.new \ - src/nix-hash/Makefile.new \ - src/nix-store/Makefile.new \ - src/nix-instantiate/Makefile.new \ - src/nix-env/Makefile.new \ - src/nix-daemon/Makefile.new \ - src/nix-log2xml/Makefile.new \ - src/bsdiff-4.3/Makefile.new \ - scripts/Makefile.new \ - corepkgs/Makefile.new - -GLOBAL_CXXFLAGS = -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr - -include mk/lib.mk diff --git a/corepkgs/Makefile.new b/corepkgs/Makefile similarity index 100% rename from corepkgs/Makefile.new rename to corepkgs/Makefile diff --git a/mk/install.mk b/mk/install.mk index d6e75d2bfb..633c432a8c 100644 --- a/mk/install.mk +++ b/mk/install.mk @@ -48,7 +48,7 @@ define install-symlink = $$(eval $$(call create-dir,$$(dir $(2)))) $(2): | $$(dir $(2)) - ln -sfn $(1) $(2) + $(QUIET) ln -sfn $(1) $(2) endef diff --git a/scripts/Makefile.new b/scripts/Makefile similarity index 100% rename from scripts/Makefile.new rename to scripts/Makefile diff --git a/src/boost/format/Makefile.new b/src/boost/format/Makefile similarity index 100% rename from src/boost/format/Makefile.new rename to src/boost/format/Makefile diff --git a/src/bsdiff-4.3/Makefile.new b/src/bsdiff-4.3/Makefile similarity index 100% rename from src/bsdiff-4.3/Makefile.new rename to src/bsdiff-4.3/Makefile diff --git a/src/libexpr/Makefile.new b/src/libexpr/Makefile similarity index 100% rename from src/libexpr/Makefile.new rename to src/libexpr/Makefile diff --git a/src/libmain/Makefile.new b/src/libmain/Makefile similarity index 100% rename from src/libmain/Makefile.new rename to src/libmain/Makefile diff --git a/src/libstore/Makefile.new b/src/libstore/Makefile similarity index 100% rename from src/libstore/Makefile.new rename to src/libstore/Makefile diff --git a/src/libutil/Makefile.new b/src/libutil/Makefile similarity index 100% rename from src/libutil/Makefile.new rename to src/libutil/Makefile diff --git a/src/nix-daemon/Makefile.new b/src/nix-daemon/Makefile similarity index 100% rename from src/nix-daemon/Makefile.new rename to src/nix-daemon/Makefile diff --git a/src/nix-env/Makefile.new b/src/nix-env/Makefile similarity index 100% rename from src/nix-env/Makefile.new rename to src/nix-env/Makefile diff --git a/src/nix-hash/Makefile.new b/src/nix-hash/Makefile similarity index 100% rename from src/nix-hash/Makefile.new rename to src/nix-hash/Makefile diff --git a/src/nix-instantiate/Makefile.new b/src/nix-instantiate/Makefile similarity index 100% rename from src/nix-instantiate/Makefile.new rename to src/nix-instantiate/Makefile diff --git a/src/nix-log2xml/Makefile.new b/src/nix-log2xml/Makefile similarity index 100% rename from src/nix-log2xml/Makefile.new rename to src/nix-log2xml/Makefile diff --git a/src/nix-store/Makefile.new b/src/nix-store/Makefile similarity index 100% rename from src/nix-store/Makefile.new rename to src/nix-store/Makefile From 8f08046606c147004642a7569f78bc61ab450419 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 25 Nov 2013 15:51:22 +0000 Subject: [PATCH 41/89] Expand configure variables before writing config.status This way, we can use config.status for generating scripts/* (without ending up with lines like "#! /usr/bin/perl -I${libexecdir}/..."). --- configure.ac | 11 ++++++++++- mk/install.mk | 2 -- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 57c294d9eb..c6bb204aef 100644 --- a/configure.ac +++ b/configure.ac @@ -180,7 +180,7 @@ AC_MSG_RESULT(yes) AC_MSG_CHECKING([for the Perl installation prefix]) perlversion=$($perl -e 'use Config; print $Config{version};') perlarchname=$($perl -e 'use Config; print $Config{archname};') -AC_SUBST(perllibdir, [$\(libdir\)/perl5/site_perl/$perlversion/$perlarchname]) +AC_SUBST(perllibdir, [${libdir}/perl5/site_perl/$perlversion/$perlarchname]) AC_MSG_RESULT($perllibdir) @@ -331,6 +331,15 @@ fi AC_SUBST(tarFlags) +# Expand all variables in config.status. +test "$prefix" = NONE && prefix=$ac_default_prefix +test "$exec_prefix" = NONE && exec_prefix='${prefix}' +for name in $ac_subst_vars; do + declare $name="$(eval echo "${!name}")" + declare $name="$(eval echo "${!name}")" + declare $name="$(eval echo "${!name}")" +done + AC_CONFIG_HEADER([config.h]) AC_CONFIG_FILES([]) AC_OUTPUT diff --git a/mk/install.mk b/mk/install.mk index 633c432a8c..c5eb8eb377 100644 --- a/mk/install.mk +++ b/mk/install.mk @@ -51,5 +51,3 @@ define install-symlink = $(QUIET) ln -sfn $(1) $(2) endef - - From 9285f0aa2b44427afef7c50f0efae8f74307a7a5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 25 Nov 2013 16:38:33 +0000 Subject: [PATCH 42/89] Add a Makefile for the Perl stuff --- Makefile | 1 + Makefile.config.in | 3 +++ mk/lib.mk | 2 +- mk/libraries.mk | 17 +++++++++++----- perl/Makefile | 41 +++++++++++++++++++++++++++++++++++++++ perl/lib/Nix/Config.pm.in | 2 +- 6 files changed, 59 insertions(+), 7 deletions(-) create mode 100644 perl/Makefile diff --git a/Makefile b/Makefile index 652085a781..6abce9372b 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,7 @@ SUBS = \ src/nix-daemon/Makefile \ src/nix-log2xml/Makefile \ src/bsdiff-4.3/Makefile \ + perl/Makefile \ scripts/Makefile \ corepkgs/Makefile diff --git a/Makefile.config.in b/Makefile.config.in index b9d9bd1c46..65080c88f7 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -16,6 +16,9 @@ exec_prefix = @exec_prefix@ libdir = @libdir@ libexecdir = @libexecdir@ localstatedir = @localstatedir@ +perl = @perl@ +perlbindings = @perlbindings@ +perllibdir = @perllibdir@ pkglibdir = $(libdir)/$(PACKAGE_NAME) prefix = @prefix@ storedir = @storedir@ diff --git a/mk/lib.mk b/mk/lib.mk index a1634bc002..107a5af3f7 100644 --- a/mk/lib.mk +++ b/mk/lib.mk @@ -58,4 +58,4 @@ $(foreach script, $(noinst_SCRIPTS), $(eval programs_list += $(script))) $(foreach template, $(template_files), $(eval $(call instantiate-template,$(template)))) -all: $(programs_list) +all: $(programs_list) $(libs_list) diff --git a/mk/libraries.mk b/mk/libraries.mk index 633bfdba81..58c67063be 100644 --- a/mk/libraries.mk +++ b/mk/libraries.mk @@ -22,11 +22,14 @@ libs_list := # - $(1)_LDFLAGS_PROPAGATED: additional linker flags, also propagated # to the linking of programs/libraries that use this library. # +# - $(1)_FORCE_INSTALL: if defined, the library will be installed even +# if it's not needed (i.e. dynamically linked) by a program. +# +# - $(1)_INSTALL_DIR: the directory where the library will be +# installed. Defaults to $(libdir). +# # - BUILD_SHARED_LIBS: if equal to ‘1’, a dynamic library will be # built, otherwise a static library. -# -# - libdir: the directory where the library will be installed (if -# required). define build-library = $(1)_NAME ?= $(1) _d := $$(strip $$($(1)_DIR)) @@ -34,6 +37,8 @@ define build-library = $(1)_OBJS := $$(addsuffix .o, $$(basename $$(_srcs))) _libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_PATH)) + $(1)_INSTALL_DIR ?= $$(libdir) + $(1)_LDFLAGS_USE := $(1)_LDFLAGS_USE_INSTALLED := @@ -50,8 +55,6 @@ define build-library = $(1)_LDFLAGS_USE += -L$$(_d) -Wl,-rpath,$$(abspath $$(_d)) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME))) - $(1)_INSTALL_DIR := $$(libdir) - $(1)_INSTALL_PATH := $$($(1)_INSTALL_DIR)/$$($(1)_NAME).so _libs_final := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_INSTALL_PATH)) @@ -63,6 +66,10 @@ define build-library = $(1)_LDFLAGS_USE_INSTALLED += -L$$($(1)_INSTALL_DIR) -Wl,-rpath,$$($(1)_INSTALL_DIR) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME))) + ifdef $(1)_FORCE_INSTALL + install: $$($(1)_INSTALL_PATH) + endif + else $(1)_PATH := $$(_d)/$$($(1)_NAME).a diff --git a/perl/Makefile b/perl/Makefile new file mode 100644 index 0000000000..a0788e2a28 --- /dev/null +++ b/perl/Makefile @@ -0,0 +1,41 @@ +nix_perl_sources := \ + $(d)/lib/Nix/Store.pm \ + $(d)/lib/Nix/Manifest.pm \ + $(d)/lib/Nix/GeneratePatches.pm \ + $(d)/lib/Nix/SSH.pm \ + $(d)/lib/Nix/CopyClosure.pm \ + $(d)/lib/Nix/Config.pm.in \ + $(d)/lib/Nix/Utils.pm + +nix_perl_modules := $(nix_perl_sources:.in=) + +$(foreach x, $(nix_perl_modules), $(eval $(call install-data-in, $(x), $(perllibdir)/Nix))) + +ifeq ($(perlbindings), yes) + + $(d)/lib/Nix/Store.cc: $(d)/lib/Nix/Store.xs + xsubpp $^ -output $@ + + LIBS += Store + + Store_DIR := $(d)/lib/Nix + + Store_SOURCES = Store.cc + + Store_LIBS = libstore + + Store_CXXFLAGS = \ + -I$(shell $(perl) -e 'use Config; print $$Config{archlibexp};')/CORE \ + -D_FILE_OFFSET_BITS=64 + + Store_ALLOW_UNDEFINED = 1 + + Store_FORCE_INSTALL = 1 + + Store_INSTALL_DIR = $(perllibdir)/auto/Nix/Store + +endif + +clean_files += $(d)/lib/Nix/Config.pm $(d)/lib/Nix/Store.cc + +dist_files += $(nix_perl_sources) diff --git a/perl/lib/Nix/Config.pm.in b/perl/lib/Nix/Config.pm.in index 8c902ab6ed..ee9d865ca3 100644 --- a/perl/lib/Nix/Config.pm.in +++ b/perl/lib/Nix/Config.pm.in @@ -1,6 +1,6 @@ package Nix::Config; -$version = "@version@"; +$version = "@PACKAGE_VERSION@"; $binDir = $ENV{"NIX_BIN_DIR"} || "@bindir@"; $libexecDir = $ENV{"NIX_LIBEXEC_DIR"} || "@libexecdir@"; From 0202ce6b94f287f70a6723473c73a4c7f135dae4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 25 Nov 2013 18:47:03 +0100 Subject: [PATCH 43/89] =?UTF-8?q?Add=20support=20for=20=E2=80=98make=20ins?= =?UTF-8?q?tallcheck=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 9 --------- Makefile | 3 ++- Makefile.config.in | 2 +- corepkgs/config.nix.in | 2 +- mk/lib.mk | 6 ++++++ scripts/nix-reduce-build.in | 2 +- src/nix-log2xml/Makefile | 3 +++ tests/Makefile | 21 +++++++++++++++++++++ tests/common.sh.in | 8 ++++---- tests/{config.nix.in => config.nix} | 12 +++++++----- tests/parallel.sh | 12 ++++++------ 11 files changed, 52 insertions(+), 28 deletions(-) create mode 100644 tests/Makefile rename tests/{config.nix.in => config.nix} (60%) diff --git a/.gitignore b/.gitignore index fafe8a17a4..42c7be2b7e 100644 --- a/.gitignore +++ b/.gitignore @@ -85,10 +85,6 @@ Makefile.config # /src/nix-log2xml/ /src/nix-log2xml/nix-log2xml -/src/nix-log2xml/test*.* -/src/nix-log2xml/*.log -/src/nix-log2xml/*.xml -/src/nix-log2xml/*.html # /src/nix-store/ /src/nix-store/nix-store @@ -98,7 +94,6 @@ Makefile.config # /tests/ /tests/test-tmp -/tests/config.nix /tests/common.sh /tests/dummy /tests/result* @@ -111,11 +106,7 @@ Makefile.config /perl/lib/Nix/Config.pm /perl/lib/Nix/Store.cc -.deps -.libs *.a -*.lo -*.la *.o *.so *.dep diff --git a/Makefile b/Makefile index 6abce9372b..85a2dc8e52 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,8 @@ SUBS = \ src/bsdiff-4.3/Makefile \ perl/Makefile \ scripts/Makefile \ - corepkgs/Makefile + corepkgs/Makefile \ + tests/Makefile GLOBAL_CXXFLAGS = -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr diff --git a/Makefile.config.in b/Makefile.config.in index 65080c88f7..130da26256 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -1,5 +1,4 @@ BDW_GC_LIBS = @BDW_GC_LIBS@ -BUILD_DEBUG = 1 CC = @CC@ CFLAGS = @CFLAGS@ CXX = @CXX@ @@ -8,6 +7,7 @@ HAVE_OPENSSL = @HAVE_OPENSSL@ OPENSSL_LIBS = @OPENSSL_LIBS@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ +bash = @bash@ bindir = @bindir@ bsddiff_compat_include = @bsddiff_compat_include@ datadir = @datadir@ diff --git a/corepkgs/config.nix.in b/corepkgs/config.nix.in index 3819dc96c1..a5ec83b9ea 100644 --- a/corepkgs/config.nix.in +++ b/corepkgs/config.nix.in @@ -4,7 +4,7 @@ let if val != "" then val else def; in { perl = "@perl@"; - shell = "@shell@"; + shell = "@bash@"; coreutils = "@coreutils@"; bzip2 = "@bzip2@"; gzip = "@gzip@"; diff --git a/mk/lib.mk b/mk/lib.mk index 107a5af3f7..60b6815e9e 100644 --- a/mk/lib.mk +++ b/mk/lib.mk @@ -17,6 +17,8 @@ noinst_SCRIPTS := # Pass -fPIC if we're building dynamic libraries. +BUILD_SHARED_LIBS = 1 + ifeq ($(BUILD_SHARED_LIBS), 1) GLOBAL_CFLAGS += -fPIC GLOBAL_CXXFLAGS += -fPIC @@ -25,6 +27,8 @@ endif # Pass -g if we want debug info. +BUILD_DEBUG = 1 + ifeq ($(BUILD_DEBUG), 1) GLOBAL_CFLAGS += -g GLOBAL_CXXFLAGS += -g @@ -38,6 +42,7 @@ include mk/libraries.mk include mk/programs.mk include mk/patterns.mk include mk/templates.mk +include mk/tests.mk # Include all sub-Makefiles. @@ -56,6 +61,7 @@ $(foreach script, $(bin_SCRIPTS), $(eval $(call install-program-in,$(script),$(b $(foreach script, $(bin_SCRIPTS), $(eval programs_list += $(script))) $(foreach script, $(noinst_SCRIPTS), $(eval programs_list += $(script))) $(foreach template, $(template_files), $(eval $(call instantiate-template,$(template)))) +$(foreach test, $(INSTALL_TESTS), $(eval $(call run-install-test,$(test)))) all: $(programs_list) $(libs_list) diff --git a/scripts/nix-reduce-build.in b/scripts/nix-reduce-build.in index 0c33275d5e..50beb9d10b 100755 --- a/scripts/nix-reduce-build.in +++ b/scripts/nix-reduce-build.in @@ -1,4 +1,4 @@ -#! @shell@ +#! @bash@ WORKING_DIRECTORY=$(mktemp -d "${TMPDIR:-/tmp}"/nix-reduce-build-XXXXXX); cd "$WORKING_DIRECTORY"; diff --git a/src/nix-log2xml/Makefile b/src/nix-log2xml/Makefile index a88f948671..8b02dca7ae 100644 --- a/src/nix-log2xml/Makefile +++ b/src/nix-log2xml/Makefile @@ -3,3 +3,6 @@ PROGRAMS += nix-log2xml nix-log2xml_DIR := $(d) nix-log2xml_SOURCES = log2xml.cc + +$(foreach file, mark-errors.xsl log2html.xsl treebits.js, \ + $(eval $(call install-data-in, $(d)/$(file), $(datadir)/nix/log2html))) diff --git a/tests/Makefile b/tests/Makefile new file mode 100644 index 0000000000..21ffd047f6 --- /dev/null +++ b/tests/Makefile @@ -0,0 +1,21 @@ +check: + @echo "Warning: Nix has no 'make check'. Please install Nix and run 'make installcheck' instead." + +nix_tests = \ + init.sh hash.sh lang.sh add.sh simple.sh dependencies.sh \ + parallel.sh build-hook.sh substitutes.sh substitutes2.sh \ + fallback.sh nix-push.sh gc.sh gc-concurrent.sh verify.sh nix-pull.sh \ + referrers.sh user-envs.sh logging.sh nix-build.sh misc.sh fixed.sh \ + gc-runtime.sh install-package.sh check-refs.sh filter-source.sh \ + remote-store.sh export.sh export-graph.sh negative-caching.sh \ + binary-patching.sh timeout.sh secure-drv-outputs.sh nix-channel.sh \ + multiple-outputs.sh import-derivation.sh fetchurl.sh optimise-store.sh \ + binary-cache.sh nix-profile.sh + +INSTALL_TESTS += $(foreach x, $(nix_tests), tests/$(x)) + +TESTS_ENVIRONMENT = NIX_REMOTE= $(bash) -e + +clean_files += $(d)/common.sh + +installcheck: $(d)/common.sh diff --git a/tests/common.sh.in b/tests/common.sh.in index 2ae34603fc..633769ae2c 100644 --- a/tests/common.sh.in +++ b/tests/common.sh.in @@ -1,7 +1,7 @@ set -e datadir="@datadir@" -profiledir="@profiledir@" +profiledir="@sysconfdir@/profile.d" export TEST_ROOT=$(pwd)/test-tmp export NIX_STORE_DIR @@ -16,7 +16,7 @@ export NIX_STATE_DIR=$TEST_ROOT/var/nix export NIX_DB_DIR=$TEST_ROOT/db export NIX_CONF_DIR=$TEST_ROOT/etc export NIX_MANIFESTS_DIR=$TEST_ROOT/var/nix/manifests -export SHARED=$TEST_ROOT/shared +export _NIX_TEST_SHARED=$TEST_ROOT/shared export NIX_REMOTE=$NIX_REMOTE_ export PATH=@bindir@:$PATH @@ -26,9 +26,9 @@ export dot=@dot@ export xmllint="@xmllint@" export xmlflags="@xmlflags@" export xsltproc="@xsltproc@" -export SHELL="@shell@" +export SHELL="@bash@" -export version=@version@ +export version=@PACKAGE_VERSION@ export system=@system@ readLink() { diff --git a/tests/config.nix.in b/tests/config.nix similarity index 60% rename from tests/config.nix.in rename to tests/config.nix index db3da14513..6244a15fa4 100644 --- a/tests/config.nix.in +++ b/tests/config.nix @@ -1,12 +1,14 @@ +with import ; + rec { - shell = "@shell@"; + inherit shell; - path = "@testPath@"; + path = coreutils; - system = "@system@"; + system = builtins.currentSystem; + + shared = builtins.getEnv "_NIX_TEST_SHARED"; - shared = "@extra1@"; - mkDerivation = args: derivation ({ inherit system; diff --git a/tests/parallel.sh b/tests/parallel.sh index 9b150263a5..3b7bbe5a22 100644 --- a/tests/parallel.sh +++ b/tests/parallel.sh @@ -6,7 +6,7 @@ echo "testing nix-build -j..." clearStore -rm -f $SHARED.cur $SHARED.max +rm -f $_NIX_TEST_SHARED.cur $_NIX_TEST_SHARED.max outPath=$(nix-build -j10000 parallel.nix --no-out-link) @@ -15,8 +15,8 @@ echo "output path is $outPath" text=$(cat "$outPath") if test "$text" != "abacade"; then exit 1; fi -if test "$(cat $SHARED.cur)" != 0; then fail "wrong current process count"; fi -if test "$(cat $SHARED.max)" != 3; then fail "not enough parallelism"; fi +if test "$(cat $_NIX_TEST_SHARED.cur)" != 0; then fail "wrong current process count"; fi +if test "$(cat $_NIX_TEST_SHARED.max)" != 3; then fail "not enough parallelism"; fi # Second, test that parallel invocations of nix-build perform builds @@ -25,7 +25,7 @@ echo "testing multiple nix-build -j1..." clearStore -rm -f $SHARED.cur $SHARED.max +rm -f $_NIX_TEST_SHARED.cur $_NIX_TEST_SHARED.max drvPath=$(nix-instantiate parallel.nix --argstr sleepTime 15) @@ -52,5 +52,5 @@ wait $pid2 || fail "instance 2 failed: $?" wait $pid3 || fail "instance 3 failed: $?" wait $pid4 || fail "instance 4 failed: $?" -if test "$(cat $SHARED.cur)" != 0; then fail "wrong current process count"; fi -if test "$(cat $SHARED.max)" != 3; then fail "not enough parallelism"; fi +if test "$(cat $_NIX_TEST_SHARED.cur)" != 0; then fail "wrong current process count"; fi +if test "$(cat $_NIX_TEST_SHARED.max)" != 3; then fail "not enough parallelism"; fi From f3cf0436b520918e061bf91efef3bb19b99bf726 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 2 Dec 2013 20:21:31 +0000 Subject: [PATCH 44/89] Install bsdiff and bspatch in $(libexecdir)/nix --- perl/lib/Nix/GeneratePatches.pm | 2 +- scripts/download-using-manifests.pl.in | 2 +- src/bsdiff-4.3/Makefile | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/perl/lib/Nix/GeneratePatches.pm b/perl/lib/Nix/GeneratePatches.pm index f9d83c49c8..612c8a3a15 100644 --- a/perl/lib/Nix/GeneratePatches.pm +++ b/perl/lib/Nix/GeneratePatches.pm @@ -225,7 +225,7 @@ sub generatePatches { } my $time1 = time(); - my $res = system("ulimit -t $timeLimit; $Nix::Config::libexecDir/bsdiff $tmpDir/A $tmpDir/B $tmpDir/DIFF"); + my $res = system("ulimit -t $timeLimit; $Nix::Config::libexecDir/nix/bsdiff $tmpDir/A $tmpDir/B $tmpDir/DIFF"); my $time2 = time(); if ($res) { warn "binary diff computation aborted after ", $time2 - $time1, " seconds\n"; diff --git a/scripts/download-using-manifests.pl.in b/scripts/download-using-manifests.pl.in index 9d4b89bac9..b670163038 100755 --- a/scripts/download-using-manifests.pl.in +++ b/scripts/download-using-manifests.pl.in @@ -317,7 +317,7 @@ while (scalar @path > 0) { # Apply the patch to the NAR archive produced in step 1 (for # the already present path) or a later step (for patch sequences). print STDERR " applying patch...\n"; - system("$Nix::Config::libexecDir/bspatch $tmpNar $tmpNar2 $patchPath") == 0 + system("$Nix::Config::libexecDir/nix/bspatch $tmpNar $tmpNar2 $patchPath") == 0 or die "cannot apply patch `$patchPath' to $tmpNar\n"; if ($curStep < $maxStep) { diff --git a/src/bsdiff-4.3/Makefile b/src/bsdiff-4.3/Makefile index a56f6c124d..c0d74e0ca4 100644 --- a/src/bsdiff-4.3/Makefile +++ b/src/bsdiff-4.3/Makefile @@ -3,11 +3,11 @@ PROGRAMS += bsdiff bspatch bsdiff_DIR := $(d) bsdiff_SOURCES = bsdiff.c bsdiff_LDFLAGS = -lbz2 $(bsddiff_compat_include) -bsdiff_INSTALL_DIR = $(libexecdir) +bsdiff_INSTALL_DIR = $(libexecdir)/nix bspatch_DIR := $(d) bspatch_SOURCES = bspatch.c bspatch_LDFLAGS = -lbz2 $(bsddiff_compat_include) -bspatch_INSTALL_DIR = $(libexecdir) +bspatch_INSTALL_DIR = $(libexecdir)/nix dist_files += $(d)/compat-include/* From bf8b66adcfdc04f2f0f0a482c66dd419a355cad6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 4 Dec 2013 13:41:32 -0500 Subject: [PATCH 45/89] Add missing file --- mk/tests.mk | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 mk/tests.mk diff --git a/mk/tests.mk b/mk/tests.mk new file mode 100644 index 0000000000..8a3bff66e8 --- /dev/null +++ b/mk/tests.mk @@ -0,0 +1,29 @@ +# Run program $1 as part of ‘make installcheck’. +define run-install-test = + + installcheck: $1 + + # Run the test in its own directory to mimick Automake behaviour. + $1.run: $1 $(_PREV_TEST) + + _installcheck_list += $1 + +endef + +installcheck: install + @total=0; failed=0; for i in $(_installcheck_list); do \ + total=$$((total + 1)); \ + echo "running test $$i"; \ + if (cd $$(dirname $$i) && $(TESTS_ENVIRONMENT) $$(basename $$i)); then \ + echo "PASS: $$i"; \ + else \ + echo "FAIL: $$i"; \ + failed=$$((failed + 1)); \ + fi; \ + done; \ + if [ "$$failed" != 0 ]; then \ + echo "$$failed out of $$total tests failed "; \ + exit 1; \ + fi + +.PHONY: check installcheck From 49a385096e08b42277b7105d5d8d1e0e62b6b7a4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 10 Dec 2013 15:54:34 +0100 Subject: [PATCH 46/89] Initial commit (imported from the Nix repo) --- mk/clean.mk | 7 ++++ mk/dist.mk | 10 +++++ mk/install.mk | 53 +++++++++++++++++++++++++++ mk/lib.mk | 67 ++++++++++++++++++++++++++++++++++ mk/libraries.mk | 97 +++++++++++++++++++++++++++++++++++++++++++++++++ mk/patterns.mk | 5 +++ mk/programs.mk | 57 +++++++++++++++++++++++++++++ mk/templates.mk | 10 +++++ mk/tests.mk | 29 +++++++++++++++ 9 files changed, 335 insertions(+) create mode 100644 mk/clean.mk create mode 100644 mk/dist.mk create mode 100644 mk/install.mk create mode 100644 mk/lib.mk create mode 100644 mk/libraries.mk create mode 100644 mk/patterns.mk create mode 100644 mk/programs.mk create mode 100644 mk/templates.mk create mode 100644 mk/tests.mk diff --git a/mk/clean.mk b/mk/clean.mk new file mode 100644 index 0000000000..3287ac8732 --- /dev/null +++ b/mk/clean.mk @@ -0,0 +1,7 @@ +clean_files := + +clean: + rm -fv $(clean_files) + +dryclean: + @echo $(clean_files) diff --git a/mk/dist.mk b/mk/dist.mk new file mode 100644 index 0000000000..3e89aec81f --- /dev/null +++ b/mk/dist.mk @@ -0,0 +1,10 @@ +dist_name = $(PACKAGE_NAME)-$(PACKAGE_VERSION) + +dist_files := + +dist: $(dist_name).tar.bz2 + +$(dist_name).tar.bz2: $(dist_files) + $(QUIET) tar cvfj $@ $(dist_files) --transform 's,^,$(dist_name)/,' + +clean_files += $(dist_name).tar.bz2 diff --git a/mk/install.mk b/mk/install.mk new file mode 100644 index 0000000000..c5eb8eb377 --- /dev/null +++ b/mk/install.mk @@ -0,0 +1,53 @@ +# Add a rule for creating $(1) as a directory. This template may be +# called multiple times for the same directory. +define create-dir = + ifndef $(1)_SEEN + $(1)_SEEN = 1 + $(1): + $(QUIET) install -d $(1) + endif +endef + + +# Add a rule for installing file $(1) as file $(2) with mode $(3). +# The directory containing $(2) will be created automatically. +define install-file-as = + + install: $(2) + + $$(eval $$(call create-dir,$$(dir $(2)))) + + $(2): $(1) | $$(dir $(2)) + $(QUIET) install -m $(3) $(1) $(2) + +endef + + +# Add a rule for installing file $(1) in directory $(2) with mode +# $(3). The directory will be created automatically. +define install-file-in = + $$(eval $$(call install-file-as,$(1),$(2)/$$(notdir $(1)),$(3))) +endef + + +define install-program-in = + $$(eval $$(call install-file-in,$(1),$(2),0755)) +endef + + +define install-data-in = + $$(eval $$(call install-file-in,$(1),$(2),0644)) +endef + + +# Install a symlink from $(2) to $(1). Note that $(1) need not exist. +define install-symlink = + + install: $(2) + + $$(eval $$(call create-dir,$$(dir $(2)))) + + $(2): | $$(dir $(2)) + $(QUIET) ln -sfn $(1) $(2) + +endef diff --git a/mk/lib.mk b/mk/lib.mk new file mode 100644 index 0000000000..60b6815e9e --- /dev/null +++ b/mk/lib.mk @@ -0,0 +1,67 @@ +default: all + + +# Include Autoconf variables. +template_files += Makefile.config +include Makefile.config + + +# Get rid of default suffixes. FIXME: is this a good idea? +.SUFFIXES: + + +# Initialise some variables. +QUIET = @ +bin_SCRIPTS := +noinst_SCRIPTS := + + +# Pass -fPIC if we're building dynamic libraries. +BUILD_SHARED_LIBS = 1 + +ifeq ($(BUILD_SHARED_LIBS), 1) + GLOBAL_CFLAGS += -fPIC + GLOBAL_CXXFLAGS += -fPIC + GLOBAL_LDFLAGS += -Wl,--no-copy-dt-needed-entries +endif + + +# Pass -g if we want debug info. +BUILD_DEBUG = 1 + +ifeq ($(BUILD_DEBUG), 1) + GLOBAL_CFLAGS += -g + GLOBAL_CXXFLAGS += -g +endif + + +include mk/clean.mk +include mk/dist.mk +include mk/install.mk +include mk/libraries.mk +include mk/programs.mk +include mk/patterns.mk +include mk/templates.mk +include mk/tests.mk + + +# Include all sub-Makefiles. +define include-sub-makefile = + d := $$(patsubst %/, %, $$(dir $(1))) + include $(1) +endef + +$(foreach mf, $(SUBS), $(eval $(call include-sub-makefile, $(mf)))) + + +# Instantiate stuff. +$(foreach lib, $(LIBS), $(eval $(call build-library,$(lib)))) +$(foreach prog, $(PROGRAMS), $(eval $(call build-program,$(prog)))) +$(foreach script, $(bin_SCRIPTS), $(eval $(call install-program-in,$(script),$(bindir)))) +$(foreach script, $(bin_SCRIPTS), $(eval programs_list += $(script))) +$(foreach script, $(noinst_SCRIPTS), $(eval programs_list += $(script))) +$(foreach template, $(template_files), $(eval $(call instantiate-template,$(template)))) +$(foreach test, $(INSTALL_TESTS), $(eval $(call run-install-test,$(test)))) + + +all: $(programs_list) $(libs_list) diff --git a/mk/libraries.mk b/mk/libraries.mk new file mode 100644 index 0000000000..58c67063be --- /dev/null +++ b/mk/libraries.mk @@ -0,0 +1,97 @@ +libs_list := + +# Build a library with symbolic name $(1). The library is defined by +# various variables prefixed by ‘$(1)_’: +# +# - $(1)_NAME: the name of the library (e.g. ‘libfoo’); defaults to +# $(1). +# +# - $(1)_DIR: the directory containing the sources of the library, and +# where the (non-installed) library will be placed. +# +# - $(1)_SOURCES: the source files of the library. +# +# - $(1)_LIBS: the symbolic names of other libraries on which this +# library depends. +# +# - $(1)_ALLOW_UNDEFINED: if set, the library is allowed to have +# undefined symbols. Has no effect for static libraries. +# +# - $(1)_LDFLAGS: additional linker flags. +# +# - $(1)_LDFLAGS_PROPAGATED: additional linker flags, also propagated +# to the linking of programs/libraries that use this library. +# +# - $(1)_FORCE_INSTALL: if defined, the library will be installed even +# if it's not needed (i.e. dynamically linked) by a program. +# +# - $(1)_INSTALL_DIR: the directory where the library will be +# installed. Defaults to $(libdir). +# +# - BUILD_SHARED_LIBS: if equal to ‘1’, a dynamic library will be +# built, otherwise a static library. +define build-library = + $(1)_NAME ?= $(1) + _d := $$(strip $$($(1)_DIR)) + _srcs := $$(foreach src, $$($(1)_SOURCES), $$(_d)/$$(src)) + $(1)_OBJS := $$(addsuffix .o, $$(basename $$(_srcs))) + _libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_PATH)) + + $(1)_INSTALL_DIR ?= $$(libdir) + + $(1)_LDFLAGS_USE := + $(1)_LDFLAGS_USE_INSTALLED := + + ifeq ($(BUILD_SHARED_LIBS), 1) + + ifndef $(1)_ALLOW_UNDEFINED + $(1)_LDFLAGS += -z defs + endif + + $(1)_PATH := $$(_d)/$$($(1)_NAME).so + + $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) + $(QUIET) $(CXX) -o $$@ -shared $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) + + $(1)_LDFLAGS_USE += -L$$(_d) -Wl,-rpath,$$(abspath $$(_d)) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME))) + + $(1)_INSTALL_PATH := $$($(1)_INSTALL_DIR)/$$($(1)_NAME).so + + _libs_final := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_INSTALL_PATH)) + + $$(eval $$(call create-dir,$$($(1)_INSTALL_DIR))) + + $$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | $$($(1)_INSTALL_DIR) + $(QUIET) $(CXX) -o $$@ -shared $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) + + $(1)_LDFLAGS_USE_INSTALLED += -L$$($(1)_INSTALL_DIR) -Wl,-rpath,$$($(1)_INSTALL_DIR) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME))) + + ifdef $(1)_FORCE_INSTALL + install: $$($(1)_INSTALL_PATH) + endif + + else + + $(1)_PATH := $$(_d)/$$($(1)_NAME).a + + $$($(1)_PATH): $$($(1)_OBJS) + $(QUIET) ar crs $$@ $$? + + $(1)_LDFLAGS_USE += $$($(1)_PATH) $$($(1)_LDFLAGS) + + $(1)_INSTALL_PATH := $$(libdir)/$$($(1)_NAME).a + + endif + + $(1)_LDFLAGS_USE += $$($(1)_LDFLAGS_PROPAGATED) + $(1)_LDFLAGS_USE_INSTALLED += $$($(1)_LDFLAGS_PROPAGATED) + + # Propagate CXXFLAGS to the individual object files. + $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS))) + + include $$(wildcard $$(_d)/*.dep) + + libs_list += $$($(1)_PATH) + clean_files += $$(_d)/*.a $$(_d)/*.so $$(_d)/*.o $$(_d)/*.dep + dist_files += $$(_srcs) +endef diff --git a/mk/patterns.mk b/mk/patterns.mk new file mode 100644 index 0000000000..87d90955bf --- /dev/null +++ b/mk/patterns.mk @@ -0,0 +1,5 @@ +%.o: %.cc + $(QUIET) $(CXX) -o $@ -c $< $(GLOBAL_CXXFLAGS) $(CXXFLAGS) $($@_CXXFLAGS) -MMD -MF $(basename $@).dep -MP + +%.o: %.c + $(QUIET) $(CC) -o $@ -c $< $(GLOBAL_CFLAGS) $(CFLAGS) $($@_CFLAGS) -MMD -MF $(basename $@).dep -MP diff --git a/mk/programs.mk b/mk/programs.mk new file mode 100644 index 0000000000..648a6053b4 --- /dev/null +++ b/mk/programs.mk @@ -0,0 +1,57 @@ +programs_list := + +# Build a program with symbolic name $(1). The program is defined by +# various variables prefixed by ‘$(1)_’: +# +# - $(1)_DIR: the directory containing the sources of the program, and +# where the (non-installed) program will be placed. +# +# - $(1)_SOURCES: the source files of the program. +# +# - $(1)_LIBS: the symbolic names of libraries on which this program +# depends. +# +# - $(1)_LDFLAGS: additional linker flags. +# +# - $(1)_INSTALL_DIR: the directory where the program will be +# installed; defaults to $(bindir). +define build-program = + _d := $$($(1)_DIR) + _srcs := $$(foreach src, $$($(1)_SOURCES), $$(_d)/$$(src)) + $(1)_OBJS := $$(addsuffix .o, $$(basename $$(_srcs))) + _libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_PATH)) + $(1)_PATH := $$(_d)/$(1) + + $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) + $(QUIET) $(CXX) -o $$@ $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) + + $(1)_INSTALL_DIR ?= $$(bindir) + $(1)_INSTALL_PATH := $$($(1)_INSTALL_DIR)/$(1) + + $$(eval $$(call create-dir,$$($(1)_INSTALL_DIR))) + + install: $$($(1)_INSTALL_PATH) + + ifeq ($(BUILD_SHARED_LIBS), 1) + + _libs_final := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_INSTALL_PATH)) + + $$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | $$($(1)_INSTALL_DIR) + $(QUIET) $(CXX) -o $$@ $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) + + else + + $$($(1)_INSTALL_PATH): $$($(1)_PATH) | $$($(1)_INSTALL_DIR) + install -t $$($(1)_INSTALL_DIR) $$< + + endif + + # Propagate CXXFLAGS to the individual object files. + $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS))) + + include $$(wildcard $$(_d)/*.dep) + + programs_list += $$($(1)_PATH) + clean_files += $$($(1)_PATH) $$(_d)/*.o $$(_d)/*.dep + dist_files += $$(_srcs) +endef diff --git a/mk/templates.mk b/mk/templates.mk new file mode 100644 index 0000000000..fa91e25095 --- /dev/null +++ b/mk/templates.mk @@ -0,0 +1,10 @@ +# Create the file $(1) from $(1).in by running config.status (which +# substitutes all ‘@var@’ variables set by the configure script). +define instantiate-template = + + clean_files += $(1) + +endef + +%: %.in + $(QUIET) ./config.status --quiet --file $@ diff --git a/mk/tests.mk b/mk/tests.mk new file mode 100644 index 0000000000..8a3bff66e8 --- /dev/null +++ b/mk/tests.mk @@ -0,0 +1,29 @@ +# Run program $1 as part of ‘make installcheck’. +define run-install-test = + + installcheck: $1 + + # Run the test in its own directory to mimick Automake behaviour. + $1.run: $1 $(_PREV_TEST) + + _installcheck_list += $1 + +endef + +installcheck: install + @total=0; failed=0; for i in $(_installcheck_list); do \ + total=$$((total + 1)); \ + echo "running test $$i"; \ + if (cd $$(dirname $$i) && $(TESTS_ENVIRONMENT) $$(basename $$i)); then \ + echo "PASS: $$i"; \ + else \ + echo "FAIL: $$i"; \ + failed=$$((failed + 1)); \ + fi; \ + done; \ + if [ "$$failed" != 0 ]; then \ + echo "$$failed out of $$total tests failed "; \ + exit 1; \ + fi + +.PHONY: check installcheck From 3560f52cc427a4eb368815ae7dd9badffba84f3f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 12 Dec 2013 11:22:08 +0100 Subject: [PATCH 47/89] dryclean: Show what actual files would be deleted --- mk/clean.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mk/clean.mk b/mk/clean.mk index 3287ac8732..703e32e2dd 100644 --- a/mk/clean.mk +++ b/mk/clean.mk @@ -1,7 +1,7 @@ clean_files := clean: - rm -fv $(clean_files) + $(QUIET) rm -fv -- $(clean_files) dryclean: - @echo $(clean_files) + @for i in $(clean_files); do if [ -e $$i ]; then echo $$i; fi; done From dfcc64f556295481bfea0b68cab11604ec131189 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 12 Dec 2013 11:22:25 +0100 Subject: [PATCH 48/89] Only provide 'make dist' if PACKAGE_NAME is set --- mk/dist.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mk/dist.mk b/mk/dist.mk index 3e89aec81f..444c58b3fe 100644 --- a/mk/dist.mk +++ b/mk/dist.mk @@ -1,3 +1,5 @@ +ifdef PACKAGE_NAME + dist_name = $(PACKAGE_NAME)-$(PACKAGE_VERSION) dist_files := @@ -8,3 +10,5 @@ $(dist_name).tar.bz2: $(dist_files) $(QUIET) tar cvfj $@ $(dist_files) --transform 's,^,$(dist_name)/,' clean_files += $(dist_name).tar.bz2 + +endif From c34f3c5ba4f353d67ec4a88a32c3aa688347aa4d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 12 Dec 2013 11:22:57 +0100 Subject: [PATCH 49/89] Handle *.cpp extension --- mk/patterns.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mk/patterns.mk b/mk/patterns.mk index 87d90955bf..77e1721361 100644 --- a/mk/patterns.mk +++ b/mk/patterns.mk @@ -1,5 +1,8 @@ %.o: %.cc $(QUIET) $(CXX) -o $@ -c $< $(GLOBAL_CXXFLAGS) $(CXXFLAGS) $($@_CXXFLAGS) -MMD -MF $(basename $@).dep -MP +%.o: %.cpp + $(QUIET) $(CXX) -o $@ -c $< $(GLOBAL_CXXFLAGS) $(CXXFLAGS) $($@_CXXFLAGS) -MMD -MF $(basename $@).dep -MP + %.o: %.c $(QUIET) $(CC) -o $@ -c $< $(GLOBAL_CFLAGS) $(CFLAGS) $($@_CFLAGS) -MMD -MF $(basename $@).dep -MP From 45131da736f21975e5b6d03f508b49f10621a30e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 12 Dec 2013 11:24:03 +0100 Subject: [PATCH 50/89] Get rid of whitespace in $(d) --- mk/lib.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/lib.mk b/mk/lib.mk index 60b6815e9e..f093ee8e0d 100644 --- a/mk/lib.mk +++ b/mk/lib.mk @@ -47,7 +47,7 @@ include mk/tests.mk # Include all sub-Makefiles. define include-sub-makefile = - d := $$(patsubst %/, %, $$(dir $(1))) + d := $$(patsubst %/,%,$$(dir $(1))) include $(1) endef From 034bbcafafdbec0b2c4d29b1d5018bec20120e77 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 12 Dec 2013 11:27:47 +0100 Subject: [PATCH 51/89] Add 'make help' --- mk/lib.mk | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/mk/lib.mk b/mk/lib.mk index f093ee8e0d..0b469a13a4 100644 --- a/mk/lib.mk +++ b/mk/lib.mk @@ -65,3 +65,27 @@ $(foreach test, $(INSTALL_TESTS), $(eval $(call run-install-test,$(test)))) all: $(programs_list) $(libs_list) + + +help: + @echo "The following targets are available:" + @echo "" + @echo " default: Build default targets" + @echo " install: Install into \$$(prefix) (currently set to '$(prefix)')" + @echo " clean: Delete generated files" + @echo " dryclean: Show what files would be deleted by 'make clean'" +ifdef PACKAGE_NAME + @echo " dist: Generate a source distribution" +endif +ifdef programs_list + @echo "" + @echo "The following programs can be built:" + @echo "" + @for i in $(programs_list); do echo " $$i"; done +endif +ifdef libs_list + @echo "" + @echo "The following libraries can be built:" + @echo "" + @for i in $(libs_list); do echo " $$i"; done +endif From 4da804651378b612313c8fb71688f71a4717a26e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 12 Dec 2013 11:39:58 +0100 Subject: [PATCH 52/89] Don't include all *.dep files --- mk/libraries.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mk/libraries.mk b/mk/libraries.mk index 58c67063be..bea684490f 100644 --- a/mk/libraries.mk +++ b/mk/libraries.mk @@ -89,9 +89,11 @@ define build-library = # Propagate CXXFLAGS to the individual object files. $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS))) - include $$(wildcard $$(_d)/*.dep) + # Include .dep files, if they exist. + $(1)_DEPS := $$(addsuffix .dep, $$(basename $$(_srcs))) + -include $$($(1)_DEPS) libs_list += $$($(1)_PATH) - clean_files += $$(_d)/*.a $$(_d)/*.so $$(_d)/*.o $$(_d)/*.dep + clean_files += $$(_d)/*.a $$(_d)/*.so $$(_d)/*.o $$(_d)/*.dep $$($(1)_DEPS) $$($(1)_OBJS) dist_files += $$(_srcs) endef From a630635d7f0e63a865ddd3b0a3cf2d44c603c0e5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 16 Dec 2013 16:49:41 +0100 Subject: [PATCH 53/89] No longer interpret $(..._SOURCES) relative to $(..._DIR) --- mk/libraries.mk | 11 ++++++++--- mk/programs.mk | 15 ++++++++++----- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/mk/libraries.mk b/mk/libraries.mk index bea684490f..bc258b799f 100644 --- a/mk/libraries.mk +++ b/mk/libraries.mk @@ -6,11 +6,13 @@ libs_list := # - $(1)_NAME: the name of the library (e.g. ‘libfoo’); defaults to # $(1). # -# - $(1)_DIR: the directory containing the sources of the library, and -# where the (non-installed) library will be placed. +# - $(1)_DIR: the directory where the (non-installed) library will be +# placed. # # - $(1)_SOURCES: the source files of the library. # +# - $(1)_CXXFLAGS: additional C++ compiler flags. +# # - $(1)_LIBS: the symbolic names of other libraries on which this # library depends. # @@ -33,7 +35,7 @@ libs_list := define build-library = $(1)_NAME ?= $(1) _d := $$(strip $$($(1)_DIR)) - _srcs := $$(foreach src, $$($(1)_SOURCES), $$(_d)/$$(src)) + _srcs := $$(foreach src, $$($(1)_SOURCES), $$(src)) $(1)_OBJS := $$(addsuffix .o, $$(basename $$(_srcs))) _libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_PATH)) @@ -89,6 +91,9 @@ define build-library = # Propagate CXXFLAGS to the individual object files. $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS))) + # Make each object file depend on the common dependencies. + $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj): $$($(1)_COMMON_DEPS))) + # Include .dep files, if they exist. $(1)_DEPS := $$(addsuffix .dep, $$(basename $$(_srcs))) -include $$($(1)_DEPS) diff --git a/mk/programs.mk b/mk/programs.mk index 648a6053b4..52e55598cb 100644 --- a/mk/programs.mk +++ b/mk/programs.mk @@ -3,8 +3,8 @@ programs_list := # Build a program with symbolic name $(1). The program is defined by # various variables prefixed by ‘$(1)_’: # -# - $(1)_DIR: the directory containing the sources of the program, and -# where the (non-installed) program will be placed. +# - $(1)_DIR: the directory where the (non-installed) program will be +# placed. # # - $(1)_SOURCES: the source files of the program. # @@ -17,7 +17,7 @@ programs_list := # installed; defaults to $(bindir). define build-program = _d := $$($(1)_DIR) - _srcs := $$(foreach src, $$($(1)_SOURCES), $$(_d)/$$(src)) + _srcs := $$(foreach src, $$($(1)_SOURCES), $$(src)) $(1)_OBJS := $$(addsuffix .o, $$(basename $$(_srcs))) _libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_PATH)) $(1)_PATH := $$(_d)/$(1) @@ -49,9 +49,14 @@ define build-program = # Propagate CXXFLAGS to the individual object files. $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS))) - include $$(wildcard $$(_d)/*.dep) + # Make each object file depend on the common dependencies. + $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj): $$($(1)_COMMON_DEPS))) + + # Include .dep files, if they exist. + $(1)_DEPS := $$(addsuffix .dep, $$(basename $$(_srcs))) + -include $$($(1)_DEPS) programs_list += $$($(1)_PATH) - clean_files += $$($(1)_PATH) $$(_d)/*.o $$(_d)/*.dep + clean_files += $$($(1)_PATH) $$(_d)/*.o $$(_d)/*.dep $$($(1)_DEPS) $$($(1)_OBJS) dist_files += $$(_srcs) endef From e81b82a2cf0c7e460d02c554c597a6cf9a144e8e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 16 Dec 2013 16:51:05 +0100 Subject: [PATCH 54/89] make dryclean: Sort names --- mk/clean.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/clean.mk b/mk/clean.mk index 703e32e2dd..7dba76c5d9 100644 --- a/mk/clean.mk +++ b/mk/clean.mk @@ -4,4 +4,4 @@ clean: $(QUIET) rm -fv -- $(clean_files) dryclean: - @for i in $(clean_files); do if [ -e $$i ]; then echo $$i; fi; done + @for i in $(clean_files); do if [ -e $$i ]; then echo $$i; fi; done | sort From 088552b319d8f5896e6cfd6a8e449b4239696ea2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 17 Dec 2013 12:13:48 +0100 Subject: [PATCH 55/89] Set default installation paths --- mk/lib.mk | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/mk/lib.mk b/mk/lib.mk index 0b469a13a4..cec4eee1fd 100644 --- a/mk/lib.mk +++ b/mk/lib.mk @@ -1,11 +1,6 @@ default: all -# Include Autoconf variables. -template_files += Makefile.config -include Makefile.config - - # Get rid of default suffixes. FIXME: is this a good idea? .SUFFIXES: @@ -16,8 +11,18 @@ bin_SCRIPTS := noinst_SCRIPTS := +# Default installation paths. +prefix ?= /usr/local +libdir ?= $(prefix)/lib +bindir ?= $(prefix)/bin +libexecdir ?= $(prefix)/libexec +datadir ?= $(prefix)/share +localstatedir ?= $(prefix)/var +sysconfdir ?= $(prefix)/etc + + # Pass -fPIC if we're building dynamic libraries. -BUILD_SHARED_LIBS = 1 +BUILD_SHARED_LIBS ?= 1 ifeq ($(BUILD_SHARED_LIBS), 1) GLOBAL_CFLAGS += -fPIC @@ -27,7 +32,7 @@ endif # Pass -g if we want debug info. -BUILD_DEBUG = 1 +BUILD_DEBUG ?= 1 ifeq ($(BUILD_DEBUG), 1) GLOBAL_CFLAGS += -g From 99ed25accfd968003d3b0d294720828a1348ce47 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 18 Dec 2013 15:01:14 +0100 Subject: [PATCH 56/89] Add a function for doing recursive wildcard searches Source: http://blog.jgc.org/2011/07/gnu-make-recursive-wildcard-function.html --- mk/lib.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mk/lib.mk b/mk/lib.mk index cec4eee1fd..1d2f051628 100644 --- a/mk/lib.mk +++ b/mk/lib.mk @@ -40,6 +40,11 @@ ifeq ($(BUILD_DEBUG), 1) endif +# Utility function for recursively finding files, e.g. +# ‘$(call rwildcard, path/to/dir, *.c *.h)’. +rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d)) + + include mk/clean.mk include mk/dist.mk include mk/install.mk From 259086de841d155f7951c2cc50f799a4631aa512 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 18 Dec 2013 16:40:48 +0100 Subject: [PATCH 57/89] Add support for building JARs from Java sources --- mk/jars.mk | 29 +++++++++++++++++++++++++++++ mk/lib.mk | 11 ++++++++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 mk/jars.mk diff --git a/mk/jars.mk b/mk/jars.mk new file mode 100644 index 0000000000..5d459c0a9d --- /dev/null +++ b/mk/jars.mk @@ -0,0 +1,29 @@ +define build-jar = + $(1)_NAME ?= $(1) + + _d := $$(strip $$($(1)_DIR)) + + $(1)_PATH := $$(_d)/$$($(1)_NAME).jar + + $(1)_TMPDIR := $$(_d)/.$$($(1)_NAME).jar.tmp + + $$($(1)_PATH): $$($(1)_SOURCES) + @rm -rf $$($(1)_TMPDIR) + @mkdir -p $$($(1)_TMPDIR) + $(QUIET) javac $(GLOBAL_JAVACFLAGS) $$($(1)_JAVACFLAGS) -d $$($(1)_TMPDIR) $$($(1)_SOURCES) + $(QUIET) jar cf $$($(1)_PATH) -C $$($(1)_TMPDIR) . + @rm -rf $$($(1)_TMPDIR) + + $(1)_INSTALL_DIR ?= $$(libdir)/java + + $(1)_INSTALL_PATH := $$($(1)_INSTALL_DIR)/$$($(1)_NAME).jar + + $$(eval $$(call install-file-as, $$($(1)_PATH), $$($(1)_INSTALL_PATH), 0644)) + + install: $$($(1)_INSTALL_PATH) + + jars_list += $$($(1)_PATH) + + clean_files += $$($(1)_PATH) + +endef diff --git a/mk/lib.mk b/mk/lib.mk index 1d2f051628..2d8ceef55f 100644 --- a/mk/lib.mk +++ b/mk/lib.mk @@ -37,6 +37,7 @@ BUILD_DEBUG ?= 1 ifeq ($(BUILD_DEBUG), 1) GLOBAL_CFLAGS += -g GLOBAL_CXXFLAGS += -g + GLOBAL_JAVACFLAGS += -g endif @@ -50,6 +51,7 @@ include mk/dist.mk include mk/install.mk include mk/libraries.mk include mk/programs.mk +include mk/jars.mk include mk/patterns.mk include mk/templates.mk include mk/tests.mk @@ -67,6 +69,7 @@ $(foreach mf, $(SUBS), $(eval $(call include-sub-makefile, $(mf)))) # Instantiate stuff. $(foreach lib, $(LIBS), $(eval $(call build-library,$(lib)))) $(foreach prog, $(PROGRAMS), $(eval $(call build-program,$(prog)))) +$(foreach jar, $(JARS), $(eval $(call build-jar,$(jar)))) $(foreach script, $(bin_SCRIPTS), $(eval $(call install-program-in,$(script),$(bindir)))) $(foreach script, $(bin_SCRIPTS), $(eval programs_list += $(script))) $(foreach script, $(noinst_SCRIPTS), $(eval programs_list += $(script))) @@ -74,7 +77,7 @@ $(foreach template, $(template_files), $(eval $(call instantiate-template,$(temp $(foreach test, $(INSTALL_TESTS), $(eval $(call run-install-test,$(test)))) -all: $(programs_list) $(libs_list) +all: $(programs_list) $(libs_list) $(jars_list) help: @@ -99,3 +102,9 @@ ifdef libs_list @echo "" @for i in $(libs_list); do echo " $$i"; done endif +ifdef jars_list + @echo "" + @echo "The following JARs can be built:" + @echo "" + @for i in $(jars_list); do echo " $$i"; done +endif From 55c9a40613fefda6622aa9acd22cce4006fd1077 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 9 Jan 2014 16:12:02 +0100 Subject: [PATCH 58/89] Move stuff to top-level This makes it easier to use with "git subtree". --- mk/clean.mk => clean.mk | 0 mk/dist.mk => dist.mk | 0 mk/install.mk => install.mk | 0 mk/jars.mk => jars.mk | 0 mk/lib.mk => lib.mk | 0 mk/libraries.mk => libraries.mk | 0 mk/patterns.mk => patterns.mk | 0 mk/programs.mk => programs.mk | 0 mk/templates.mk => templates.mk | 0 mk/tests.mk => tests.mk | 0 10 files changed, 0 insertions(+), 0 deletions(-) rename mk/clean.mk => clean.mk (100%) rename mk/dist.mk => dist.mk (100%) rename mk/install.mk => install.mk (100%) rename mk/jars.mk => jars.mk (100%) rename mk/lib.mk => lib.mk (100%) rename mk/libraries.mk => libraries.mk (100%) rename mk/patterns.mk => patterns.mk (100%) rename mk/programs.mk => programs.mk (100%) rename mk/templates.mk => templates.mk (100%) rename mk/tests.mk => tests.mk (100%) diff --git a/mk/clean.mk b/clean.mk similarity index 100% rename from mk/clean.mk rename to clean.mk diff --git a/mk/dist.mk b/dist.mk similarity index 100% rename from mk/dist.mk rename to dist.mk diff --git a/mk/install.mk b/install.mk similarity index 100% rename from mk/install.mk rename to install.mk diff --git a/mk/jars.mk b/jars.mk similarity index 100% rename from mk/jars.mk rename to jars.mk diff --git a/mk/lib.mk b/lib.mk similarity index 100% rename from mk/lib.mk rename to lib.mk diff --git a/mk/libraries.mk b/libraries.mk similarity index 100% rename from mk/libraries.mk rename to libraries.mk diff --git a/mk/patterns.mk b/patterns.mk similarity index 100% rename from mk/patterns.mk rename to patterns.mk diff --git a/mk/programs.mk b/programs.mk similarity index 100% rename from mk/programs.mk rename to programs.mk diff --git a/mk/templates.mk b/templates.mk similarity index 100% rename from mk/templates.mk rename to templates.mk diff --git a/mk/tests.mk b/tests.mk similarity index 100% rename from mk/tests.mk rename to tests.mk From 568b1b0a8a65cb255d6a7a33dfe2c15df3212103 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 9 Jan 2014 16:15:16 +0100 Subject: [PATCH 59/89] Remove mk subdirectory in preparation for "git subtree" --- mk/clean.mk | 7 ---- mk/dist.mk | 10 ----- mk/install.mk | 53 --------------------------- mk/lib.mk | 67 ---------------------------------- mk/libraries.mk | 97 ------------------------------------------------- mk/patterns.mk | 5 --- mk/programs.mk | 57 ----------------------------- mk/templates.mk | 10 ----- mk/tests.mk | 29 --------------- 9 files changed, 335 deletions(-) delete mode 100644 mk/clean.mk delete mode 100644 mk/dist.mk delete mode 100644 mk/install.mk delete mode 100644 mk/lib.mk delete mode 100644 mk/libraries.mk delete mode 100644 mk/patterns.mk delete mode 100644 mk/programs.mk delete mode 100644 mk/templates.mk delete mode 100644 mk/tests.mk diff --git a/mk/clean.mk b/mk/clean.mk deleted file mode 100644 index 3287ac8732..0000000000 --- a/mk/clean.mk +++ /dev/null @@ -1,7 +0,0 @@ -clean_files := - -clean: - rm -fv $(clean_files) - -dryclean: - @echo $(clean_files) diff --git a/mk/dist.mk b/mk/dist.mk deleted file mode 100644 index 3e89aec81f..0000000000 --- a/mk/dist.mk +++ /dev/null @@ -1,10 +0,0 @@ -dist_name = $(PACKAGE_NAME)-$(PACKAGE_VERSION) - -dist_files := - -dist: $(dist_name).tar.bz2 - -$(dist_name).tar.bz2: $(dist_files) - $(QUIET) tar cvfj $@ $(dist_files) --transform 's,^,$(dist_name)/,' - -clean_files += $(dist_name).tar.bz2 diff --git a/mk/install.mk b/mk/install.mk deleted file mode 100644 index c5eb8eb377..0000000000 --- a/mk/install.mk +++ /dev/null @@ -1,53 +0,0 @@ -# Add a rule for creating $(1) as a directory. This template may be -# called multiple times for the same directory. -define create-dir = - ifndef $(1)_SEEN - $(1)_SEEN = 1 - $(1): - $(QUIET) install -d $(1) - endif -endef - - -# Add a rule for installing file $(1) as file $(2) with mode $(3). -# The directory containing $(2) will be created automatically. -define install-file-as = - - install: $(2) - - $$(eval $$(call create-dir,$$(dir $(2)))) - - $(2): $(1) | $$(dir $(2)) - $(QUIET) install -m $(3) $(1) $(2) - -endef - - -# Add a rule for installing file $(1) in directory $(2) with mode -# $(3). The directory will be created automatically. -define install-file-in = - $$(eval $$(call install-file-as,$(1),$(2)/$$(notdir $(1)),$(3))) -endef - - -define install-program-in = - $$(eval $$(call install-file-in,$(1),$(2),0755)) -endef - - -define install-data-in = - $$(eval $$(call install-file-in,$(1),$(2),0644)) -endef - - -# Install a symlink from $(2) to $(1). Note that $(1) need not exist. -define install-symlink = - - install: $(2) - - $$(eval $$(call create-dir,$$(dir $(2)))) - - $(2): | $$(dir $(2)) - $(QUIET) ln -sfn $(1) $(2) - -endef diff --git a/mk/lib.mk b/mk/lib.mk deleted file mode 100644 index 60b6815e9e..0000000000 --- a/mk/lib.mk +++ /dev/null @@ -1,67 +0,0 @@ -default: all - - -# Include Autoconf variables. -template_files += Makefile.config -include Makefile.config - - -# Get rid of default suffixes. FIXME: is this a good idea? -.SUFFIXES: - - -# Initialise some variables. -QUIET = @ -bin_SCRIPTS := -noinst_SCRIPTS := - - -# Pass -fPIC if we're building dynamic libraries. -BUILD_SHARED_LIBS = 1 - -ifeq ($(BUILD_SHARED_LIBS), 1) - GLOBAL_CFLAGS += -fPIC - GLOBAL_CXXFLAGS += -fPIC - GLOBAL_LDFLAGS += -Wl,--no-copy-dt-needed-entries -endif - - -# Pass -g if we want debug info. -BUILD_DEBUG = 1 - -ifeq ($(BUILD_DEBUG), 1) - GLOBAL_CFLAGS += -g - GLOBAL_CXXFLAGS += -g -endif - - -include mk/clean.mk -include mk/dist.mk -include mk/install.mk -include mk/libraries.mk -include mk/programs.mk -include mk/patterns.mk -include mk/templates.mk -include mk/tests.mk - - -# Include all sub-Makefiles. -define include-sub-makefile = - d := $$(patsubst %/, %, $$(dir $(1))) - include $(1) -endef - -$(foreach mf, $(SUBS), $(eval $(call include-sub-makefile, $(mf)))) - - -# Instantiate stuff. -$(foreach lib, $(LIBS), $(eval $(call build-library,$(lib)))) -$(foreach prog, $(PROGRAMS), $(eval $(call build-program,$(prog)))) -$(foreach script, $(bin_SCRIPTS), $(eval $(call install-program-in,$(script),$(bindir)))) -$(foreach script, $(bin_SCRIPTS), $(eval programs_list += $(script))) -$(foreach script, $(noinst_SCRIPTS), $(eval programs_list += $(script))) -$(foreach template, $(template_files), $(eval $(call instantiate-template,$(template)))) -$(foreach test, $(INSTALL_TESTS), $(eval $(call run-install-test,$(test)))) - - -all: $(programs_list) $(libs_list) diff --git a/mk/libraries.mk b/mk/libraries.mk deleted file mode 100644 index 58c67063be..0000000000 --- a/mk/libraries.mk +++ /dev/null @@ -1,97 +0,0 @@ -libs_list := - -# Build a library with symbolic name $(1). The library is defined by -# various variables prefixed by ‘$(1)_’: -# -# - $(1)_NAME: the name of the library (e.g. ‘libfoo’); defaults to -# $(1). -# -# - $(1)_DIR: the directory containing the sources of the library, and -# where the (non-installed) library will be placed. -# -# - $(1)_SOURCES: the source files of the library. -# -# - $(1)_LIBS: the symbolic names of other libraries on which this -# library depends. -# -# - $(1)_ALLOW_UNDEFINED: if set, the library is allowed to have -# undefined symbols. Has no effect for static libraries. -# -# - $(1)_LDFLAGS: additional linker flags. -# -# - $(1)_LDFLAGS_PROPAGATED: additional linker flags, also propagated -# to the linking of programs/libraries that use this library. -# -# - $(1)_FORCE_INSTALL: if defined, the library will be installed even -# if it's not needed (i.e. dynamically linked) by a program. -# -# - $(1)_INSTALL_DIR: the directory where the library will be -# installed. Defaults to $(libdir). -# -# - BUILD_SHARED_LIBS: if equal to ‘1’, a dynamic library will be -# built, otherwise a static library. -define build-library = - $(1)_NAME ?= $(1) - _d := $$(strip $$($(1)_DIR)) - _srcs := $$(foreach src, $$($(1)_SOURCES), $$(_d)/$$(src)) - $(1)_OBJS := $$(addsuffix .o, $$(basename $$(_srcs))) - _libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_PATH)) - - $(1)_INSTALL_DIR ?= $$(libdir) - - $(1)_LDFLAGS_USE := - $(1)_LDFLAGS_USE_INSTALLED := - - ifeq ($(BUILD_SHARED_LIBS), 1) - - ifndef $(1)_ALLOW_UNDEFINED - $(1)_LDFLAGS += -z defs - endif - - $(1)_PATH := $$(_d)/$$($(1)_NAME).so - - $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) - $(QUIET) $(CXX) -o $$@ -shared $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) - - $(1)_LDFLAGS_USE += -L$$(_d) -Wl,-rpath,$$(abspath $$(_d)) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME))) - - $(1)_INSTALL_PATH := $$($(1)_INSTALL_DIR)/$$($(1)_NAME).so - - _libs_final := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_INSTALL_PATH)) - - $$(eval $$(call create-dir,$$($(1)_INSTALL_DIR))) - - $$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | $$($(1)_INSTALL_DIR) - $(QUIET) $(CXX) -o $$@ -shared $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) - - $(1)_LDFLAGS_USE_INSTALLED += -L$$($(1)_INSTALL_DIR) -Wl,-rpath,$$($(1)_INSTALL_DIR) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME))) - - ifdef $(1)_FORCE_INSTALL - install: $$($(1)_INSTALL_PATH) - endif - - else - - $(1)_PATH := $$(_d)/$$($(1)_NAME).a - - $$($(1)_PATH): $$($(1)_OBJS) - $(QUIET) ar crs $$@ $$? - - $(1)_LDFLAGS_USE += $$($(1)_PATH) $$($(1)_LDFLAGS) - - $(1)_INSTALL_PATH := $$(libdir)/$$($(1)_NAME).a - - endif - - $(1)_LDFLAGS_USE += $$($(1)_LDFLAGS_PROPAGATED) - $(1)_LDFLAGS_USE_INSTALLED += $$($(1)_LDFLAGS_PROPAGATED) - - # Propagate CXXFLAGS to the individual object files. - $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS))) - - include $$(wildcard $$(_d)/*.dep) - - libs_list += $$($(1)_PATH) - clean_files += $$(_d)/*.a $$(_d)/*.so $$(_d)/*.o $$(_d)/*.dep - dist_files += $$(_srcs) -endef diff --git a/mk/patterns.mk b/mk/patterns.mk deleted file mode 100644 index 87d90955bf..0000000000 --- a/mk/patterns.mk +++ /dev/null @@ -1,5 +0,0 @@ -%.o: %.cc - $(QUIET) $(CXX) -o $@ -c $< $(GLOBAL_CXXFLAGS) $(CXXFLAGS) $($@_CXXFLAGS) -MMD -MF $(basename $@).dep -MP - -%.o: %.c - $(QUIET) $(CC) -o $@ -c $< $(GLOBAL_CFLAGS) $(CFLAGS) $($@_CFLAGS) -MMD -MF $(basename $@).dep -MP diff --git a/mk/programs.mk b/mk/programs.mk deleted file mode 100644 index 648a6053b4..0000000000 --- a/mk/programs.mk +++ /dev/null @@ -1,57 +0,0 @@ -programs_list := - -# Build a program with symbolic name $(1). The program is defined by -# various variables prefixed by ‘$(1)_’: -# -# - $(1)_DIR: the directory containing the sources of the program, and -# where the (non-installed) program will be placed. -# -# - $(1)_SOURCES: the source files of the program. -# -# - $(1)_LIBS: the symbolic names of libraries on which this program -# depends. -# -# - $(1)_LDFLAGS: additional linker flags. -# -# - $(1)_INSTALL_DIR: the directory where the program will be -# installed; defaults to $(bindir). -define build-program = - _d := $$($(1)_DIR) - _srcs := $$(foreach src, $$($(1)_SOURCES), $$(_d)/$$(src)) - $(1)_OBJS := $$(addsuffix .o, $$(basename $$(_srcs))) - _libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_PATH)) - $(1)_PATH := $$(_d)/$(1) - - $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) - $(QUIET) $(CXX) -o $$@ $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) - - $(1)_INSTALL_DIR ?= $$(bindir) - $(1)_INSTALL_PATH := $$($(1)_INSTALL_DIR)/$(1) - - $$(eval $$(call create-dir,$$($(1)_INSTALL_DIR))) - - install: $$($(1)_INSTALL_PATH) - - ifeq ($(BUILD_SHARED_LIBS), 1) - - _libs_final := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_INSTALL_PATH)) - - $$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | $$($(1)_INSTALL_DIR) - $(QUIET) $(CXX) -o $$@ $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) - - else - - $$($(1)_INSTALL_PATH): $$($(1)_PATH) | $$($(1)_INSTALL_DIR) - install -t $$($(1)_INSTALL_DIR) $$< - - endif - - # Propagate CXXFLAGS to the individual object files. - $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS))) - - include $$(wildcard $$(_d)/*.dep) - - programs_list += $$($(1)_PATH) - clean_files += $$($(1)_PATH) $$(_d)/*.o $$(_d)/*.dep - dist_files += $$(_srcs) -endef diff --git a/mk/templates.mk b/mk/templates.mk deleted file mode 100644 index fa91e25095..0000000000 --- a/mk/templates.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Create the file $(1) from $(1).in by running config.status (which -# substitutes all ‘@var@’ variables set by the configure script). -define instantiate-template = - - clean_files += $(1) - -endef - -%: %.in - $(QUIET) ./config.status --quiet --file $@ diff --git a/mk/tests.mk b/mk/tests.mk deleted file mode 100644 index 8a3bff66e8..0000000000 --- a/mk/tests.mk +++ /dev/null @@ -1,29 +0,0 @@ -# Run program $1 as part of ‘make installcheck’. -define run-install-test = - - installcheck: $1 - - # Run the test in its own directory to mimick Automake behaviour. - $1.run: $1 $(_PREV_TEST) - - _installcheck_list += $1 - -endef - -installcheck: install - @total=0; failed=0; for i in $(_installcheck_list); do \ - total=$$((total + 1)); \ - echo "running test $$i"; \ - if (cd $$(dirname $$i) && $(TESTS_ENVIRONMENT) $$(basename $$i)); then \ - echo "PASS: $$i"; \ - else \ - echo "FAIL: $$i"; \ - failed=$$((failed + 1)); \ - fi; \ - done; \ - if [ "$$failed" != 0 ]; then \ - echo "$$failed out of $$total tests failed "; \ - exit 1; \ - fi - -.PHONY: check installcheck From b4c684e0f9c6890e13f9a5cc90b5e379b3d1f75d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 9 Jan 2014 16:53:47 +0100 Subject: [PATCH 60/89] Update Makefiles --- Makefile | 4 +++- perl/Makefile | 2 +- src/boost/Makefile.am | 8 -------- src/boost/format/Makefile | 2 +- src/bsdiff-4.3/Makefile | 4 ++-- src/libexpr/Makefile | 5 +---- src/libmain/Makefile | 2 +- src/libstore/Makefile | 4 +--- src/libutil/Makefile | 4 ++-- src/nix-daemon/Makefile | 2 +- src/nix-env/Makefile | 2 +- src/nix-hash/Makefile | 2 +- src/nix-instantiate/Makefile | 2 +- src/nix-log2xml/Makefile | 2 +- src/nix-store/Makefile | 2 +- 15 files changed, 18 insertions(+), 29 deletions(-) delete mode 100644 src/boost/Makefile.am diff --git a/Makefile b/Makefile index 85a2dc8e52..b0a3e27aa1 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,10 @@ SUBS = \ perl/Makefile \ scripts/Makefile \ corepkgs/Makefile \ - tests/Makefile + tests/Makefile \ GLOBAL_CXXFLAGS = -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr +include Makefile.config + include mk/lib.mk diff --git a/perl/Makefile b/perl/Makefile index a0788e2a28..8171d1945a 100644 --- a/perl/Makefile +++ b/perl/Makefile @@ -20,7 +20,7 @@ ifeq ($(perlbindings), yes) Store_DIR := $(d)/lib/Nix - Store_SOURCES = Store.cc + Store_SOURCES := $(Store_DIR)/Store.cc Store_LIBS = libstore diff --git a/src/boost/Makefile.am b/src/boost/Makefile.am deleted file mode 100644 index 8b5aa25fb5..0000000000 --- a/src/boost/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -SUBDIRS = format - -nobase_pkginclude_HEADERS = assert.hpp checked_delete.hpp format.hpp \ - shared_ptr.hpp weak_ptr.hpp throw_exception.hpp \ - enable_shared_from_this.hpp \ - detail/shared_count.hpp detail/workaround.hpp - -pkgincludedir = ${includedir}/nix/boost diff --git a/src/boost/format/Makefile b/src/boost/format/Makefile index b60a2ea4fb..17897fa590 100644 --- a/src/boost/format/Makefile +++ b/src/boost/format/Makefile @@ -4,4 +4,4 @@ libformat_NAME = libnixformat libformat_DIR := $(d) -libformat_SOURCES = format_implementation.cc free_funcs.cc parsing.cc +libformat_SOURCES := $(wildcard $(d)/*.cc) diff --git a/src/bsdiff-4.3/Makefile b/src/bsdiff-4.3/Makefile index c0d74e0ca4..aca1ac1162 100644 --- a/src/bsdiff-4.3/Makefile +++ b/src/bsdiff-4.3/Makefile @@ -1,12 +1,12 @@ PROGRAMS += bsdiff bspatch bsdiff_DIR := $(d) -bsdiff_SOURCES = bsdiff.c +bsdiff_SOURCES := $(d)/bsdiff.c bsdiff_LDFLAGS = -lbz2 $(bsddiff_compat_include) bsdiff_INSTALL_DIR = $(libexecdir)/nix bspatch_DIR := $(d) -bspatch_SOURCES = bspatch.c +bspatch_SOURCES := $(d)/bspatch.c bspatch_LDFLAGS = -lbz2 $(bsddiff_compat_include) bspatch_INSTALL_DIR = $(libexecdir)/nix diff --git a/src/libexpr/Makefile b/src/libexpr/Makefile index c6ed7d14b9..de276aa652 100644 --- a/src/libexpr/Makefile +++ b/src/libexpr/Makefile @@ -4,10 +4,7 @@ libexpr_NAME = libnixexpr libexpr_DIR := $(d) -libexpr_SOURCES = \ - nixexpr.cc eval.cc primops.cc lexer-tab.cc parser-tab.cc \ - get-drvs.cc attr-path.cc value-to-xml.cc value-to-json.cc \ - common-opts.cc names.cc +libexpr_SOURCES := $(wildcard $(d)/*.cc) $(d)/lexer-tab.cc $(d)/parser-tab.cc libexpr_LIBS = libutil libstore libformat diff --git a/src/libmain/Makefile b/src/libmain/Makefile index 7312b8d2cd..0efeee5314 100644 --- a/src/libmain/Makefile +++ b/src/libmain/Makefile @@ -4,7 +4,7 @@ libmain_NAME = libnixmain libmain_DIR := $(d) -libmain_SOURCES = shared.cc stack.cc +libmain_SOURCES := $(wildcard $(d)/*.cc) libmain_LIBS = libstore libutil libformat diff --git a/src/libstore/Makefile b/src/libstore/Makefile index eaba1005f2..83c5d8ed49 100644 --- a/src/libstore/Makefile +++ b/src/libstore/Makefile @@ -4,9 +4,7 @@ libstore_NAME = libnixstore libstore_DIR := $(d) -libstore_SOURCES = \ - store-api.cc local-store.cc remote-store.cc derivations.cc build.cc misc.cc \ - globals.cc references.cc pathlocks.cc gc.cc optimise-store.cc +libstore_SOURCES := $(wildcard $(d)/*.cc) libstore_LIBS = libutil libformat diff --git a/src/libutil/Makefile b/src/libutil/Makefile index b604c00787..83bd05f281 100644 --- a/src/libutil/Makefile +++ b/src/libutil/Makefile @@ -4,12 +4,12 @@ libutil_NAME = libnixutil libutil_DIR := $(d) -libutil_SOURCES = util.cc hash.cc serialise.cc archive.cc xml-writer.cc affinity.cc +libutil_SOURCES := $(wildcard $(d)/*.cc) ifeq ($(HAVE_OPENSSL), 1) libutil_LDFLAGS = $(OPENSSL_LIBS) else - libutil_SOURCES += md5.c sha1.c sha256.c + libutil_SOURCES += $(d)/md5.c $(d)/sha1.c $(d)/sha256.c endif libutil_LIBS = libformat diff --git a/src/nix-daemon/Makefile b/src/nix-daemon/Makefile index 2a8a7d92cd..f6bc9ea31c 100644 --- a/src/nix-daemon/Makefile +++ b/src/nix-daemon/Makefile @@ -2,6 +2,6 @@ PROGRAMS += nix-daemon nix-daemon_DIR := $(d) -nix-daemon_SOURCES = nix-daemon.cc +nix-daemon_SOURCES := $(d)/nix-daemon.cc nix-daemon_LIBS = libmain libstore libutil libformat diff --git a/src/nix-env/Makefile b/src/nix-env/Makefile index 04545231ca..5a38d2fb76 100644 --- a/src/nix-env/Makefile +++ b/src/nix-env/Makefile @@ -2,6 +2,6 @@ PROGRAMS += nix-env nix-env_DIR := $(d) -nix-env_SOURCES = nix-env.cc profiles.cc user-env.cc +nix-env_SOURCES := $(wildcard $(d)/*.cc) nix-env_LIBS = libexpr libmain libstore libutil libformat diff --git a/src/nix-hash/Makefile b/src/nix-hash/Makefile index 462cd78d8c..062e4d13b2 100644 --- a/src/nix-hash/Makefile +++ b/src/nix-hash/Makefile @@ -2,6 +2,6 @@ PROGRAMS += nix-hash nix-hash_DIR := $(d) -nix-hash_SOURCES = nix-hash.cc +nix-hash_SOURCES := $(d)/nix-hash.cc nix-hash_LIBS = libmain libstore libutil libformat diff --git a/src/nix-instantiate/Makefile b/src/nix-instantiate/Makefile index 9c4cfec287..daa741eb7f 100644 --- a/src/nix-instantiate/Makefile +++ b/src/nix-instantiate/Makefile @@ -2,6 +2,6 @@ PROGRAMS += nix-instantiate nix-instantiate_DIR := $(d) -nix-instantiate_SOURCES = nix-instantiate.cc +nix-instantiate_SOURCES := $(d)/nix-instantiate.cc nix-instantiate_LIBS = libexpr libmain libstore libutil libformat diff --git a/src/nix-log2xml/Makefile b/src/nix-log2xml/Makefile index 8b02dca7ae..8467d1973b 100644 --- a/src/nix-log2xml/Makefile +++ b/src/nix-log2xml/Makefile @@ -2,7 +2,7 @@ PROGRAMS += nix-log2xml nix-log2xml_DIR := $(d) -nix-log2xml_SOURCES = log2xml.cc +nix-log2xml_SOURCES := $(d)/log2xml.cc $(foreach file, mark-errors.xsl log2html.xsl treebits.js, \ $(eval $(call install-data-in, $(d)/$(file), $(datadir)/nix/log2html))) diff --git a/src/nix-store/Makefile b/src/nix-store/Makefile index 105513872e..edd111b420 100644 --- a/src/nix-store/Makefile +++ b/src/nix-store/Makefile @@ -2,7 +2,7 @@ PROGRAMS += nix-store nix-store_DIR := $(d) -nix-store_SOURCES = nix-store.cc dotgraph.cc xmlgraph.cc +nix-store_SOURCES := $(wildcard $(d)/*.cc) nix-store_LIBS = libmain libstore libutil libformat From 814a73227f9571d8fbd831fedced5e87cd9c926b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 9 Jan 2014 16:54:01 +0100 Subject: [PATCH 61/89] Remove duplicate elements from *_SOURCES This is useful when you do: foo_SOURCES := $(wildcard *.cc) foo.cc where foo.cc is a generated file. In this case, if foo.cc already exists, you get foo.cc twice in foo_SOURCES, leading to a link error. --- libraries.mk | 2 +- programs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries.mk b/libraries.mk index bc258b799f..98cc9f363f 100644 --- a/libraries.mk +++ b/libraries.mk @@ -35,7 +35,7 @@ libs_list := define build-library = $(1)_NAME ?= $(1) _d := $$(strip $$($(1)_DIR)) - _srcs := $$(foreach src, $$($(1)_SOURCES), $$(src)) + _srcs := $$(sort $$(foreach src, $$($(1)_SOURCES), $$(src))) $(1)_OBJS := $$(addsuffix .o, $$(basename $$(_srcs))) _libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_PATH)) diff --git a/programs.mk b/programs.mk index 52e55598cb..a97a516352 100644 --- a/programs.mk +++ b/programs.mk @@ -17,7 +17,7 @@ programs_list := # installed; defaults to $(bindir). define build-program = _d := $$($(1)_DIR) - _srcs := $$(foreach src, $$($(1)_SOURCES), $$(src)) + _srcs := $$(sort $$(foreach src, $$($(1)_SOURCES), $$(src))) $(1)_OBJS := $$(addsuffix .o, $$(basename $$(_srcs))) _libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_PATH)) $(1)_PATH := $$(_d)/$(1) From 70d8e8fdded9e21995fecc3ecc68e14cf4f53be7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 9 Jan 2014 16:57:38 +0100 Subject: [PATCH 62/89] Declare template_files as a simply expanded variable --- templates.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates.mk b/templates.mk index fa91e25095..01b9d9d749 100644 --- a/templates.mk +++ b/templates.mk @@ -1,3 +1,5 @@ +template_files := + # Create the file $(1) from $(1).in by running config.status (which # substitutes all ‘@var@’ variables set by the configure script). define instantiate-template = From cf918b889b2ff30d1532a62d00c21007d0cb25cd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 9 Jan 2014 17:33:55 +0100 Subject: [PATCH 63/89] Handle systems where "echo -n" doesn't work --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index c6bb204aef..753436911e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT(nix, m4_esyscmd([echo -n $(cat ./version)$VERSION_SUFFIX])) +AC_INIT(nix, m4_esyscmd([bash -c "echo -n $(cat ./version)$VERSION_SUFFIX"])) AC_CONFIG_SRCDIR(README) AC_CONFIG_AUX_DIR(config) From b1db599dd05e86f65e73dc40584913e6e78c2bac Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 9 Jan 2014 22:10:35 +0100 Subject: [PATCH 64/89] Generate schema.sql.hh --- src/libstore/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/libstore/Makefile b/src/libstore/Makefile index 83c5d8ed49..dcedd4c26a 100644 --- a/src/libstore/Makefile +++ b/src/libstore/Makefile @@ -19,3 +19,8 @@ libstore_CXXFLAGS = \ -DNIX_LIBEXEC_DIR=\"$(libexecdir)\" \ -DNIX_BIN_DIR=\"$(bindir)\" \ -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" + +$(d)/local-store.cc: $(d)/schema.sql.hh + +%.sql.hh: %.sql + sed -e 's/"/\\"/g' -e 's/\(.*\)/"\1\\n"/' < $< > $@ || (rm $@ && exit 1) From e991ab942b6ed1bc50a63afafe55ffe5cae8cbad Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 9 Jan 2014 22:14:34 +0100 Subject: [PATCH 65/89] Add support for building shared libraries on Mac OS X --- lib.mk | 5 ++++- libraries.mk | 22 +++++++++++++++++----- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/lib.mk b/lib.mk index 2d8ceef55f..5b0d2633cc 100644 --- a/lib.mk +++ b/lib.mk @@ -9,6 +9,7 @@ default: all QUIET = @ bin_SCRIPTS := noinst_SCRIPTS := +OS = $(shell uname -s) # Default installation paths. @@ -27,7 +28,9 @@ BUILD_SHARED_LIBS ?= 1 ifeq ($(BUILD_SHARED_LIBS), 1) GLOBAL_CFLAGS += -fPIC GLOBAL_CXXFLAGS += -fPIC - GLOBAL_LDFLAGS += -Wl,--no-copy-dt-needed-entries + ifneq ($(OS), Darwin) + GLOBAL_LDFLAGS += -Wl,--no-copy-dt-needed-entries + endif endif diff --git a/libraries.mk b/libraries.mk index 98cc9f363f..818c3d2172 100644 --- a/libraries.mk +++ b/libraries.mk @@ -1,5 +1,11 @@ libs_list := +ifeq ($(OS), Darwin) + SO_EXT = dylib +else + SO_EXT = so +endif + # Build a library with symbolic name $(1). The library is defined by # various variables prefixed by ‘$(1)_’: # @@ -46,18 +52,24 @@ define build-library = ifeq ($(BUILD_SHARED_LIBS), 1) - ifndef $(1)_ALLOW_UNDEFINED - $(1)_LDFLAGS += -z defs + ifdef $(1)_ALLOW_UNDEFINED + ifeq ($(OS), Darwin) + $(1)_LDFLAGS += -undefined suppress -flat_namespace + endif + else + ifneq ($(OS), Darwin) + $(1)_LDFLAGS += -z defs + endif endif - $(1)_PATH := $$(_d)/$$($(1)_NAME).so + $(1)_PATH := $$(_d)/$$($(1)_NAME).$(SO_EXT) $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) $(QUIET) $(CXX) -o $$@ -shared $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) $(1)_LDFLAGS_USE += -L$$(_d) -Wl,-rpath,$$(abspath $$(_d)) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME))) - $(1)_INSTALL_PATH := $$($(1)_INSTALL_DIR)/$$($(1)_NAME).so + $(1)_INSTALL_PATH := $$($(1)_INSTALL_DIR)/$$($(1)_NAME).$(SO_EXT) _libs_final := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_INSTALL_PATH)) @@ -99,6 +111,6 @@ define build-library = -include $$($(1)_DEPS) libs_list += $$($(1)_PATH) - clean_files += $$(_d)/*.a $$(_d)/*.so $$(_d)/*.o $$(_d)/*.dep $$($(1)_DEPS) $$($(1)_OBJS) + clean_files += $$(_d)/*.a $$(_d)/*.$(SO_EXT) $$(_d)/*.o $$(_d)/*.dep $$($(1)_DEPS) $$($(1)_OBJS) dist_files += $$(_srcs) endef From ca73c0102fc68ece171d7cc062e464b4d418d07c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 10 Jan 2014 22:31:38 +0100 Subject: [PATCH 66/89] Nicer Make output E.g. CXX src/nix-log2xml/log2xml.o CC src/bsdiff-4.3/bsdiff.o GEN scripts/nix-channel LD src/libmain/libnixmain.so --- clean.mk | 2 +- dist.mk | 2 +- install.mk | 6 +++--- jars.mk | 4 ++-- lib.mk | 2 +- libraries.mk | 6 +++--- patterns.mk | 6 +++--- programs.mk | 4 ++-- templates.mk | 2 +- tracing.mk | 16 ++++++++++++++++ 10 files changed, 33 insertions(+), 17 deletions(-) create mode 100644 tracing.mk diff --git a/clean.mk b/clean.mk index 7dba76c5d9..f45d578aa4 100644 --- a/clean.mk +++ b/clean.mk @@ -1,7 +1,7 @@ clean_files := clean: - $(QUIET) rm -fv -- $(clean_files) + $(suppress) rm -fv -- $(clean_files) dryclean: @for i in $(clean_files); do if [ -e $$i ]; then echo $$i; fi; done | sort diff --git a/dist.mk b/dist.mk index 444c58b3fe..bf97b697f9 100644 --- a/dist.mk +++ b/dist.mk @@ -7,7 +7,7 @@ dist_files := dist: $(dist_name).tar.bz2 $(dist_name).tar.bz2: $(dist_files) - $(QUIET) tar cvfj $@ $(dist_files) --transform 's,^,$(dist_name)/,' + $(suppress) tar cvfj $@ $(dist_files) --transform 's,^,$(dist_name)/,' clean_files += $(dist_name).tar.bz2 diff --git a/install.mk b/install.mk index c5eb8eb377..aee4bf38ba 100644 --- a/install.mk +++ b/install.mk @@ -4,7 +4,7 @@ define create-dir = ifndef $(1)_SEEN $(1)_SEEN = 1 $(1): - $(QUIET) install -d $(1) + $$(trace-install) install -d $(1) endif endef @@ -18,7 +18,7 @@ define install-file-as = $$(eval $$(call create-dir,$$(dir $(2)))) $(2): $(1) | $$(dir $(2)) - $(QUIET) install -m $(3) $(1) $(2) + $$(trace-install) install -m $(3) $(1) $(2) endef @@ -48,6 +48,6 @@ define install-symlink = $$(eval $$(call create-dir,$$(dir $(2)))) $(2): | $$(dir $(2)) - $(QUIET) ln -sfn $(1) $(2) + $$(trace-install) ln -sfn $(1) $(2) endef diff --git a/jars.mk b/jars.mk index 5d459c0a9d..c8075cde16 100644 --- a/jars.mk +++ b/jars.mk @@ -10,8 +10,8 @@ define build-jar = $$($(1)_PATH): $$($(1)_SOURCES) @rm -rf $$($(1)_TMPDIR) @mkdir -p $$($(1)_TMPDIR) - $(QUIET) javac $(GLOBAL_JAVACFLAGS) $$($(1)_JAVACFLAGS) -d $$($(1)_TMPDIR) $$($(1)_SOURCES) - $(QUIET) jar cf $$($(1)_PATH) -C $$($(1)_TMPDIR) . + $$(trace-javac) javac $(GLOBAL_JAVACFLAGS) $$($(1)_JAVACFLAGS) -d $$($(1)_TMPDIR) $$($(1)_SOURCES) + $$(trace-jar) jar cf $$($(1)_PATH) -C $$($(1)_TMPDIR) . @rm -rf $$($(1)_TMPDIR) $(1)_INSTALL_DIR ?= $$(libdir)/java diff --git a/lib.mk b/lib.mk index 5b0d2633cc..8894d5308b 100644 --- a/lib.mk +++ b/lib.mk @@ -6,7 +6,6 @@ default: all # Initialise some variables. -QUIET = @ bin_SCRIPTS := noinst_SCRIPTS := OS = $(shell uname -s) @@ -49,6 +48,7 @@ endif rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d)) +include mk/tracing.mk include mk/clean.mk include mk/dist.mk include mk/install.mk diff --git a/libraries.mk b/libraries.mk index 818c3d2172..1e0fe49a53 100644 --- a/libraries.mk +++ b/libraries.mk @@ -65,7 +65,7 @@ define build-library = $(1)_PATH := $$(_d)/$$($(1)_NAME).$(SO_EXT) $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) - $(QUIET) $(CXX) -o $$@ -shared $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) + $$(trace-ld) $(CXX) -o $$@ -shared $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) $(1)_LDFLAGS_USE += -L$$(_d) -Wl,-rpath,$$(abspath $$(_d)) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME))) @@ -76,7 +76,7 @@ define build-library = $$(eval $$(call create-dir,$$($(1)_INSTALL_DIR))) $$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | $$($(1)_INSTALL_DIR) - $(QUIET) $(CXX) -o $$@ -shared $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) + $$(trace-ld) $(CXX) -o $$@ -shared $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) $(1)_LDFLAGS_USE_INSTALLED += -L$$($(1)_INSTALL_DIR) -Wl,-rpath,$$($(1)_INSTALL_DIR) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME))) @@ -89,7 +89,7 @@ define build-library = $(1)_PATH := $$(_d)/$$($(1)_NAME).a $$($(1)_PATH): $$($(1)_OBJS) - $(QUIET) ar crs $$@ $$? + $(trace-ar) ar crs $$@ $$? $(1)_LDFLAGS_USE += $$($(1)_PATH) $$($(1)_LDFLAGS) diff --git a/patterns.mk b/patterns.mk index 77e1721361..91a758f338 100644 --- a/patterns.mk +++ b/patterns.mk @@ -1,8 +1,8 @@ %.o: %.cc - $(QUIET) $(CXX) -o $@ -c $< $(GLOBAL_CXXFLAGS) $(CXXFLAGS) $($@_CXXFLAGS) -MMD -MF $(basename $@).dep -MP + $(trace-cxx) $(CXX) -o $@ -c $< $(GLOBAL_CXXFLAGS) $(CXXFLAGS) $($@_CXXFLAGS) -MMD -MF $(basename $@).dep -MP %.o: %.cpp - $(QUIET) $(CXX) -o $@ -c $< $(GLOBAL_CXXFLAGS) $(CXXFLAGS) $($@_CXXFLAGS) -MMD -MF $(basename $@).dep -MP + $(trace-cxx) $(CXX) -o $@ -c $< $(GLOBAL_CXXFLAGS) $(CXXFLAGS) $($@_CXXFLAGS) -MMD -MF $(basename $@).dep -MP %.o: %.c - $(QUIET) $(CC) -o $@ -c $< $(GLOBAL_CFLAGS) $(CFLAGS) $($@_CFLAGS) -MMD -MF $(basename $@).dep -MP + $(trace-cc) $(CC) -o $@ -c $< $(GLOBAL_CFLAGS) $(CFLAGS) $($@_CFLAGS) -MMD -MF $(basename $@).dep -MP diff --git a/programs.mk b/programs.mk index a97a516352..c608a6f25a 100644 --- a/programs.mk +++ b/programs.mk @@ -23,7 +23,7 @@ define build-program = $(1)_PATH := $$(_d)/$(1) $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) - $(QUIET) $(CXX) -o $$@ $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) + $$(trace-ld) $(CXX) -o $$@ $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) $(1)_INSTALL_DIR ?= $$(bindir) $(1)_INSTALL_PATH := $$($(1)_INSTALL_DIR)/$(1) @@ -37,7 +37,7 @@ define build-program = _libs_final := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_INSTALL_PATH)) $$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | $$($(1)_INSTALL_DIR) - $(QUIET) $(CXX) -o $$@ $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) + $$(trace-ld) $(CXX) -o $$@ $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) else diff --git a/templates.mk b/templates.mk index 01b9d9d749..82f9d60255 100644 --- a/templates.mk +++ b/templates.mk @@ -9,4 +9,4 @@ define instantiate-template = endef %: %.in - $(QUIET) ./config.status --quiet --file $@ + $(trace-gen) ./config.status --quiet --file $@ diff --git a/tracing.mk b/tracing.mk new file mode 100644 index 0000000000..08c4ec1066 --- /dev/null +++ b/tracing.mk @@ -0,0 +1,16 @@ +V ?= 0 + +ifeq ($(V), 0) + + trace-gen = @echo " GEN " $@; + trace-cc = @echo " CC " $@; + trace-cxx = @echo " CXX " $@; + trace-ld = @echo " LD " $@; + trace-ar = @echo " AR " $@; + trace-install = @echo " INST " $@; + trace-javac = @echo " JAVAC " $@; + trace-jar = @echo " JAR " $@; + + suppress = @ + +endif From 68cde53c47e5447d2c91f5fe4521b5209af7b73e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 21 Jan 2014 15:34:04 +0100 Subject: [PATCH 67/89] Fix building against Bison 3.0.2 --- src/libexpr/parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y index 55a42fcaba..d89d92c7a2 100644 --- a/src/libexpr/parser.y +++ b/src/libexpr/parser.y @@ -414,7 +414,7 @@ expr_simple string_parts : STR | string_parts_interpolated { $$ = new ExprConcatStrings(true, $1); } - | { $$ = new ExprString(data->symbols.create("")) } + | { $$ = new ExprString(data->symbols.create("")); } ; string_parts_interpolated From 625ffd441d8c98331ee357f4900fa50dd9be05bc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 21 Jan 2014 16:38:03 +0100 Subject: [PATCH 68/89] Ugly hack to fix building with clang --- perl/lib/Nix/Store.xs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/perl/lib/Nix/Store.xs b/perl/lib/Nix/Store.xs index d46af57e64..07ccebe62f 100644 --- a/perl/lib/Nix/Store.xs +++ b/perl/lib/Nix/Store.xs @@ -35,6 +35,10 @@ MODULE = Nix::Store PACKAGE = Nix::Store PROTOTYPES: ENABLE +#undef dNOOP // Hack to work around "error: declaration of 'Perl___notused' has a different language linkage" error message on clang. +#define dNOOP + + void init() CODE: doInit(); From a26307b28192e61bc06b5f5ef42f0fb51858d822 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 21 Jan 2014 17:39:19 +0100 Subject: [PATCH 69/89] Fix build --- configure.ac | 6 +++--- perl/Makefile | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 753436911e..aa57543e51 100644 --- a/configure.ac +++ b/configure.ac @@ -216,9 +216,9 @@ AC_SUBST(storedir) # Look for OpenSSL, an optional dependency. -AC_PATH_PROG(openssl_prog, openssl, openssl) # if not found, call openssl in $PATH -AC_SUBST(openssl_prog) -AC_DEFINE_UNQUOTED(OPENSSL_PATH, ["$openssl_prog"], [Path of the OpenSSL binary]) +AC_PATH_PROG(openssl, openssl, openssl) # if not found, call openssl in $PATH +AC_SUBST(openssl) +AC_DEFINE_UNQUOTED(OPENSSL_PATH, ["$openssl"], [Path of the OpenSSL binary]) PKG_CHECK_MODULES([OPENSSL], [libcrypto], [AC_DEFINE([HAVE_OPENSSL], [1], [Whether to use OpenSSL.]) diff --git a/perl/Makefile b/perl/Makefile index 8171d1945a..cd07631ca8 100644 --- a/perl/Makefile +++ b/perl/Makefile @@ -5,7 +5,8 @@ nix_perl_sources := \ $(d)/lib/Nix/SSH.pm \ $(d)/lib/Nix/CopyClosure.pm \ $(d)/lib/Nix/Config.pm.in \ - $(d)/lib/Nix/Utils.pm + $(d)/lib/Nix/Utils.pm \ + $(d)/lib/Nix/Crypto.pm nix_perl_modules := $(nix_perl_sources:.in=) From 94f9c14d526abfe9b18045fc638e8f5a3a670210 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 21 Jan 2014 18:29:55 +0100 Subject: [PATCH 70/89] Fix some clang warnings --- src/libexpr/eval.hh | 14 ++++++-------- src/libexpr/nixexpr.hh | 3 ++- src/libexpr/parser.y | 2 +- src/libexpr/value.hh | 4 ++-- src/libstore/build.cc | 5 +---- src/libstore/gc.cc | 2 -- 6 files changed, 12 insertions(+), 18 deletions(-) diff --git a/src/libexpr/eval.hh b/src/libexpr/eval.hh index 45ab423c18..5ae5a1e3cf 100644 --- a/src/libexpr/eval.hh +++ b/src/libexpr/eval.hh @@ -82,8 +82,6 @@ void copyContext(const Value & v, PathSet & context); paths. */ typedef std::map SrcToStore; -struct EvalState; - std::ostream & operator << (std::ostream & str, const Value & v); @@ -216,9 +214,9 @@ private: inline Value * lookupVar(Env * env, const ExprVar & var, bool noEval); - friend class ExprVar; - friend class ExprAttrs; - friend class ExprLet; + friend struct ExprVar; + friend struct ExprAttrs; + friend struct ExprLet; Expr * parse(const char * text, const Path & path, const Path & basePath, StaticEnv & staticEnv); @@ -278,9 +276,9 @@ private: typedef std::map AttrSelects; AttrSelects attrSelects; - friend class ExprOpUpdate; - friend class ExprOpConcatLists; - friend class ExprSelect; + friend struct ExprOpUpdate; + friend struct ExprOpConcatLists; + friend struct ExprSelect; friend void prim_getAttr(EvalState & state, Value * * args, Value & v); }; diff --git a/src/libexpr/nixexpr.hh b/src/libexpr/nixexpr.hh index bc6993477c..7586fffb83 100644 --- a/src/libexpr/nixexpr.hh +++ b/src/libexpr/nixexpr.hh @@ -48,7 +48,7 @@ std::ostream & operator << (std::ostream & str, const Pos & pos); struct Env; struct Value; -struct EvalState; +class EvalState; struct StaticEnv; struct Expr; @@ -71,6 +71,7 @@ string showAttrPath(const AttrPath & attrPath); struct Expr { + virtual ~Expr() { }; virtual void show(std::ostream & str); virtual void bindVars(const StaticEnv & env); virtual void eval(EvalState & state, Env & env, Value & v); diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y index d89d92c7a2..8a084fea06 100644 --- a/src/libexpr/parser.y +++ b/src/libexpr/parser.y @@ -252,7 +252,7 @@ void yyerror(YYLTYPE * loc, yyscan_t scanner, ParseData * data, const char * err nix::Formals * formals; nix::Formal * formal; nix::NixInt n; - char * id; // !!! -> Symbol + const char * id; // !!! -> Symbol char * path; char * uri; std::vector * attrNames; diff --git a/src/libexpr/value.hh b/src/libexpr/value.hh index 9825827934..2feb2f9492 100644 --- a/src/libexpr/value.hh +++ b/src/libexpr/value.hh @@ -22,13 +22,13 @@ typedef enum { } ValueType; -struct Bindings; +class Bindings; struct Env; struct Expr; struct ExprLambda; struct PrimOp; struct PrimOp; -struct Symbol; +class Symbol; typedef long NixInt; diff --git a/src/libstore/build.cc b/src/libstore/build.cc index 4329d9a22b..1b379752fa 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -75,12 +75,9 @@ using std::map; static string pathNullDevice = "/dev/null"; -static const uid_t rootUserId = 0; - - /* Forward definition. */ class Worker; -class HookInstance; +struct HookInstance; /* A pointer to a goal. */ diff --git a/src/libstore/gc.cc b/src/libstore/gc.cc index d212259f3b..79bd7d56b3 100644 --- a/src/libstore/gc.cc +++ b/src/libstore/gc.cc @@ -22,8 +22,6 @@ static string gcLockName = "gc.lock"; static string tempRootsDir = "temproots"; static string gcRootsDir = "gcroots"; -static const int defaultGcLevel = 1000; - /* Acquire the global GC lock. This is used to prevent new Nix processes from starting after the temporary root files have been From 5311b2b25084e53ff132df96d66ab06efead0853 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 23 Jan 2014 10:49:53 +0100 Subject: [PATCH 71/89] Clang doesn't know the "-z defs" flag --- libraries.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries.mk b/libraries.mk index 1e0fe49a53..90eb125a65 100644 --- a/libraries.mk +++ b/libraries.mk @@ -58,7 +58,7 @@ define build-library = endif else ifneq ($(OS), Darwin) - $(1)_LDFLAGS += -z defs + $(1)_LDFLAGS += -Wl,-z,defs endif endif From 4a2ec9c6598aafb98e5495c2cf3a24e166668790 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 30 Jan 2014 12:08:26 +0100 Subject: [PATCH 72/89] Install nix-worker symlink --- src/nix-daemon/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/nix-daemon/Makefile b/src/nix-daemon/Makefile index f6bc9ea31c..d02f9f6ce2 100644 --- a/src/nix-daemon/Makefile +++ b/src/nix-daemon/Makefile @@ -5,3 +5,5 @@ nix-daemon_DIR := $(d) nix-daemon_SOURCES := $(d)/nix-daemon.cc nix-daemon_LIBS = libmain libstore libutil libformat + +$(eval $(call install-symlink, nix-daemon, $(bindir)/nix-worker)) From e0234dfddc8343a6bca80ba6e6e93d083ce51a85 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 30 Jan 2014 12:11:06 +0100 Subject: [PATCH 73/89] Rename Makefile -> local.mk --- Makefile | 32 +++++++++++----------- corepkgs/{Makefile => local.mk} | 0 perl/{Makefile => local.mk} | 0 scripts/{Makefile => local.mk} | 0 src/boost/format/{Makefile => local.mk} | 0 src/bsdiff-4.3/{Makefile => local.mk} | 0 src/libexpr/{Makefile => local.mk} | 0 src/libmain/{Makefile => local.mk} | 0 src/libstore/{Makefile => local.mk} | 0 src/libutil/{Makefile => local.mk} | 0 src/nix-daemon/{Makefile => local.mk} | 0 src/nix-env/{Makefile => local.mk} | 0 src/nix-hash/{Makefile => local.mk} | 0 src/nix-instantiate/{Makefile => local.mk} | 0 src/nix-log2xml/{Makefile => local.mk} | 0 src/nix-store/{Makefile => local.mk} | 0 tests/{Makefile => local.mk} | 0 17 files changed, 16 insertions(+), 16 deletions(-) rename corepkgs/{Makefile => local.mk} (100%) rename perl/{Makefile => local.mk} (100%) rename scripts/{Makefile => local.mk} (100%) rename src/boost/format/{Makefile => local.mk} (100%) rename src/bsdiff-4.3/{Makefile => local.mk} (100%) rename src/libexpr/{Makefile => local.mk} (100%) rename src/libmain/{Makefile => local.mk} (100%) rename src/libstore/{Makefile => local.mk} (100%) rename src/libutil/{Makefile => local.mk} (100%) rename src/nix-daemon/{Makefile => local.mk} (100%) rename src/nix-env/{Makefile => local.mk} (100%) rename src/nix-hash/{Makefile => local.mk} (100%) rename src/nix-instantiate/{Makefile => local.mk} (100%) rename src/nix-log2xml/{Makefile => local.mk} (100%) rename src/nix-store/{Makefile => local.mk} (100%) rename tests/{Makefile => local.mk} (100%) diff --git a/Makefile b/Makefile index b0a3e27aa1..b7ffc1b037 100644 --- a/Makefile +++ b/Makefile @@ -1,20 +1,20 @@ SUBS = \ - src/boost/format/Makefile \ - src/libutil/Makefile \ - src/libstore/Makefile \ - src/libmain/Makefile \ - src/libexpr/Makefile \ - src/nix-hash/Makefile \ - src/nix-store/Makefile \ - src/nix-instantiate/Makefile \ - src/nix-env/Makefile \ - src/nix-daemon/Makefile \ - src/nix-log2xml/Makefile \ - src/bsdiff-4.3/Makefile \ - perl/Makefile \ - scripts/Makefile \ - corepkgs/Makefile \ - tests/Makefile \ + src/boost/format/local.mk \ + src/libutil/local.mk \ + src/libstore/local.mk \ + src/libmain/local.mk \ + src/libexpr/local.mk \ + src/nix-hash/local.mk \ + src/nix-store/local.mk \ + src/nix-instantiate/local.mk \ + src/nix-env/local.mk \ + src/nix-daemon/local.mk \ + src/nix-log2xml/local.mk \ + src/bsdiff-4.3/local.mk \ + perl/local.mk \ + scripts/local.mk \ + corepkgs/local.mk \ + tests/local.mk \ GLOBAL_CXXFLAGS = -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr diff --git a/corepkgs/Makefile b/corepkgs/local.mk similarity index 100% rename from corepkgs/Makefile rename to corepkgs/local.mk diff --git a/perl/Makefile b/perl/local.mk similarity index 100% rename from perl/Makefile rename to perl/local.mk diff --git a/scripts/Makefile b/scripts/local.mk similarity index 100% rename from scripts/Makefile rename to scripts/local.mk diff --git a/src/boost/format/Makefile b/src/boost/format/local.mk similarity index 100% rename from src/boost/format/Makefile rename to src/boost/format/local.mk diff --git a/src/bsdiff-4.3/Makefile b/src/bsdiff-4.3/local.mk similarity index 100% rename from src/bsdiff-4.3/Makefile rename to src/bsdiff-4.3/local.mk diff --git a/src/libexpr/Makefile b/src/libexpr/local.mk similarity index 100% rename from src/libexpr/Makefile rename to src/libexpr/local.mk diff --git a/src/libmain/Makefile b/src/libmain/local.mk similarity index 100% rename from src/libmain/Makefile rename to src/libmain/local.mk diff --git a/src/libstore/Makefile b/src/libstore/local.mk similarity index 100% rename from src/libstore/Makefile rename to src/libstore/local.mk diff --git a/src/libutil/Makefile b/src/libutil/local.mk similarity index 100% rename from src/libutil/Makefile rename to src/libutil/local.mk diff --git a/src/nix-daemon/Makefile b/src/nix-daemon/local.mk similarity index 100% rename from src/nix-daemon/Makefile rename to src/nix-daemon/local.mk diff --git a/src/nix-env/Makefile b/src/nix-env/local.mk similarity index 100% rename from src/nix-env/Makefile rename to src/nix-env/local.mk diff --git a/src/nix-hash/Makefile b/src/nix-hash/local.mk similarity index 100% rename from src/nix-hash/Makefile rename to src/nix-hash/local.mk diff --git a/src/nix-instantiate/Makefile b/src/nix-instantiate/local.mk similarity index 100% rename from src/nix-instantiate/Makefile rename to src/nix-instantiate/local.mk diff --git a/src/nix-log2xml/Makefile b/src/nix-log2xml/local.mk similarity index 100% rename from src/nix-log2xml/Makefile rename to src/nix-log2xml/local.mk diff --git a/src/nix-store/Makefile b/src/nix-store/local.mk similarity index 100% rename from src/nix-store/Makefile rename to src/nix-store/local.mk diff --git a/tests/Makefile b/tests/local.mk similarity index 100% rename from tests/Makefile rename to tests/local.mk From 4271927c5be2c5b87ca83682d1f2bd71d5ce4a66 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 31 Jan 2014 15:33:12 +0100 Subject: [PATCH 74/89] Add support for installing man-pages --- lib.mk | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/lib.mk b/lib.mk index 8894d5308b..cbed773fe7 100644 --- a/lib.mk +++ b/lib.mk @@ -8,6 +8,7 @@ default: all # Initialise some variables. bin_SCRIPTS := noinst_SCRIPTS := +man-pages := OS = $(shell uname -s) @@ -19,6 +20,7 @@ libexecdir ?= $(prefix)/libexec datadir ?= $(prefix)/share localstatedir ?= $(prefix)/var sysconfdir ?= $(prefix)/etc +mandir ?= $(prefix)/share/man # Pass -fPIC if we're building dynamic libraries. @@ -78,9 +80,14 @@ $(foreach script, $(bin_SCRIPTS), $(eval programs_list += $(script))) $(foreach script, $(noinst_SCRIPTS), $(eval programs_list += $(script))) $(foreach template, $(template_files), $(eval $(call instantiate-template,$(template)))) $(foreach test, $(INSTALL_TESTS), $(eval $(call run-install-test,$(test)))) +$(foreach file, $(man-pages), $(eval $(call install-data-in, $(file), $(mandir)/man$(patsubst .%,%,$(suffix $(file)))))) -all: $(programs_list) $(libs_list) $(jars_list) +.PHONY: all man help + +all: $(programs_list) $(libs_list) $(jars_list) $(man-pages) + +man: $(man-pages) help: @@ -93,6 +100,9 @@ help: ifdef PACKAGE_NAME @echo " dist: Generate a source distribution" endif +ifdef man-pages + @echo " man: Generate manual pages" +endif ifdef programs_list @echo "" @echo "The following programs can be built:" From ac8c2ef1aa30c50b568883d2051335a66437694f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 1 Feb 2014 11:30:21 +0100 Subject: [PATCH 75/89] Build/install manual --- Makefile | 4 ++- Makefile.config.in | 7 ++++ configure.ac | 6 ---- doc/manual/local.mk | 79 +++++++++++++++++++++++++++++++++++++++++++++ misc/emacs/local.mk | 1 + 5 files changed, 90 insertions(+), 7 deletions(-) create mode 100644 doc/manual/local.mk create mode 100644 misc/emacs/local.mk diff --git a/Makefile b/Makefile index b7ffc1b037..f22a70a81c 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,9 @@ SUBS = \ perl/local.mk \ scripts/local.mk \ corepkgs/local.mk \ - tests/local.mk \ + misc/emacs/local.mk \ + doc/manual/local.mk \ + tests/local.mk GLOBAL_CXXFLAGS = -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr diff --git a/Makefile.config.in b/Makefile.config.in index 130da26256..f5f813b2c0 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -12,10 +12,15 @@ bindir = @bindir@ bsddiff_compat_include = @bsddiff_compat_include@ datadir = @datadir@ datarootdir = @datarootdir@ +dblatex = @dblatex@ +docbookrng = @docbookrng@ +docbookxsl = @docbookxsl@ +docdir = @docdir@ exec_prefix = @exec_prefix@ libdir = @libdir@ libexecdir = @libexecdir@ localstatedir = @localstatedir@ +mandir = @mandir@ perl = @perl@ perlbindings = @perlbindings@ perllibdir = @perllibdir@ @@ -23,3 +28,5 @@ pkglibdir = $(libdir)/$(PACKAGE_NAME) prefix = @prefix@ storedir = @storedir@ sysconfdir = @sysconfdir@ +xmllint = @xmllint@ +xsltproc = @xsltproc@ diff --git a/configure.ac b/configure.ac index aa57543e51..043aed5b36 100644 --- a/configure.ac +++ b/configure.ac @@ -203,12 +203,6 @@ AC_ARG_WITH(docbook-xsl, AC_HELP_STRING([--with-docbook-xsl=PATH], AC_SUBST(docbookxsl) -AC_ARG_WITH(xml-flags, AC_HELP_STRING([--with-xml-flags=FLAGS], - [extra flags to be passed to xmllint and xsltproc]), - xmlflags=$withval, xmlflags=) -AC_SUBST(xmlflags) - - AC_ARG_WITH(store-dir, AC_HELP_STRING([--with-store-dir=PATH], [path of the Nix store (defaults to /nix/store)]), storedir=$withval, storedir='/nix/store') diff --git a/doc/manual/local.mk b/doc/manual/local.mk new file mode 100644 index 0000000000..ae3a9df5c8 --- /dev/null +++ b/doc/manual/local.mk @@ -0,0 +1,79 @@ +XSLTPROC = $(xsltproc) --nonet $(xmlflags) \ + --param section.autolabel 1 \ + --param section.label.includes.component.label 1 \ + --param html.stylesheet \'style.css\' \ + --param xref.with.number.and.title 1 \ + --param toc.section.depth 3 \ + --param admon.style \'\' \ + --param callout.graphics.extension \'.gif\' \ + --param contrib.inline.enabled 0 + +MANUAL_SRCS := $(wildcard $(d)/*.xml) + + +# Do XInclude processing / RelaxNG validation +$(d)/manual.xmli: $(d)/manual.xml $(MANUAL_SRCS) $(d)/version.txt + $(trace-gen) $(xmllint) --nonet --xinclude $< -o $@.tmp + @mv $@.tmp $@ + +$(d)/version.txt: + $(trace-gen) echo -n $(PACKAGE_VERSION) > $@ + +# Note: RelaxNG validation requires xmllint >= 2.7.4. +$(d)/manual.is-valid: $(d)/manual.xmli + $(trace-gen) $(XSLTPROC) --novalid --stringparam profile.condition manual \ + $(docbookxsl)/profiling/profile.xsl $< 2> /dev/null | \ + $(xmllint) --nonet --noout --relaxng $(docbookrng)/docbook.rng - + @touch $@ + +clean_files += $(d)/manual.xmli $(d)/version.txt $(d)/manual.is-valid + + +# Generate man pages. +man-pages := $(foreach n, \ + nix-env.1 nix-build.1 nix-shell.1 nix-store.1 nix-instantiate.1 \ + nix-collect-garbage.1 nix-push.1 nix-pull.1 \ + nix-prefetch-url.1 nix-channel.1 \ + nix-install-package.1 nix-hash.1 nix-copy-closure.1 \ + nix.conf.5 nix-daemon.8, \ + $(d)/$(n)) + +$(man-pages): $(d)/manual.xmli $(d)/manual.is-valid + $(trace-gen) $(XSLTPROC) --stringparam profile.condition manpage \ + $(docbookxsl)/profiling/profile.xsl $< 2> /dev/null | \ + (cd doc/manual && $(XSLTPROC) $(docbookxsl)/manpages/docbook.xsl -) + +clean_files += $(d)/*.1 $(d)/*.5 $(d)/*.8 + + +# Generate the HTML manual. +$(d)/manual.html: $(d)/manual.xml $(MANUAL_SRCS) $(d)/manual.is-valid + $(trace-gen) $(XSLTPROC) --xinclude --stringparam profile.condition manual \ + $(docbookxsl)/profiling/profile.xsl $< | \ + $(XSLTPROC) --output $@ $(docbookxsl)/html/docbook.xsl - + +$(foreach file, $(d)/manual.html $(d)/style.css, $(eval $(call install-data-in, $(file), $(docdir)/manual))) + +$(foreach file, $(wildcard $(d)/figures/*.png), $(eval $(call install-data-in, $(file), $(docdir)/manual/figures))) + +$(foreach file, $(wildcard $(docbookxsl)/images/callouts/*.gif), $(eval $(call install-data-in, $(file), $(docdir)/manual/images/callouts))) + +$(eval $(call install-symlink, manual.html, $(docdir)/manual/index.html)) + +all: $(d)/manual.html + +clean_files += $(d)/manual.html + + +# Generate the PDF manual. +$(d)/manual.pdf: $(d)/manual.xml $(MANUAL_SRCS) $(d)/manual.is-valid + $(trace-gen) if test "$(dblatex)" != ""; then \ + cd doc/manual && $(XSLTPROC) --xinclude --stringparam profile.condition manual \ + $(docbookxsl)/profiling/profile.xsl manual.xml | \ + $(dblatex) -o manual.pdf $(dblatex_opts) -; \ + else \ + echo "Please install dblatex and rerun configure."; \ + exit 1; \ + fi + +clean_files += $(d)/manual.pdf diff --git a/misc/emacs/local.mk b/misc/emacs/local.mk new file mode 100644 index 0000000000..8e06b881bc --- /dev/null +++ b/misc/emacs/local.mk @@ -0,0 +1 @@ +$(eval $(call install-data-in,$(d)/nix-mode.el,$(datadir)/emacs/site-lisp)) From f324b49ea19e606f84b89ecb499f0e961646cd50 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 1 Feb 2014 11:31:25 +0100 Subject: [PATCH 76/89] Change dependency file names from foo.dep to .foo.o.dep --- dist.mk | 2 ++ install.mk | 4 ++++ lib.mk | 6 +----- libraries.mk | 4 ++-- patterns.mk | 6 +++--- programs.mk | 4 ++-- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dist.mk b/dist.mk index bf97b697f9..cd11463e8a 100644 --- a/dist.mk +++ b/dist.mk @@ -11,4 +11,6 @@ $(dist_name).tar.bz2: $(dist_files) clean_files += $(dist_name).tar.bz2 +print-top-help += echo " dist: Generate a source distribution"; + endif diff --git a/install.mk b/install.mk index aee4bf38ba..093f30b810 100644 --- a/install.mk +++ b/install.mk @@ -51,3 +51,7 @@ define install-symlink = $$(trace-install) ln -sfn $(1) $(2) endef + + +print-top-help += \ + echo " install: Install into \$$(prefix) (currently set to '$(prefix)')"; diff --git a/lib.mk b/lib.mk index cbed773fe7..f43fdd56c4 100644 --- a/lib.mk +++ b/lib.mk @@ -45,11 +45,7 @@ ifeq ($(BUILD_DEBUG), 1) endif -# Utility function for recursively finding files, e.g. -# ‘$(call rwildcard, path/to/dir, *.c *.h)’. -rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d)) - - +include mk/functions.mk include mk/tracing.mk include mk/clean.mk include mk/dist.mk diff --git a/libraries.mk b/libraries.mk index 90eb125a65..461a3e9a62 100644 --- a/libraries.mk +++ b/libraries.mk @@ -107,10 +107,10 @@ define build-library = $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj): $$($(1)_COMMON_DEPS))) # Include .dep files, if they exist. - $(1)_DEPS := $$(addsuffix .dep, $$(basename $$(_srcs))) + $(1)_DEPS := $$(foreach fn, $$($(1)_OBJS), $$(call filename-to-dep, $$(fn))) -include $$($(1)_DEPS) libs_list += $$($(1)_PATH) - clean_files += $$(_d)/*.a $$(_d)/*.$(SO_EXT) $$(_d)/*.o $$(_d)/*.dep $$($(1)_DEPS) $$($(1)_OBJS) + clean_files += $$(_d)/*.a $$(_d)/*.$(SO_EXT) $$(_d)/*.o $$(_d)/.*.dep $$($(1)_DEPS) $$($(1)_OBJS) dist_files += $$(_srcs) endef diff --git a/patterns.mk b/patterns.mk index 91a758f338..f5674d4043 100644 --- a/patterns.mk +++ b/patterns.mk @@ -1,8 +1,8 @@ %.o: %.cc - $(trace-cxx) $(CXX) -o $@ -c $< $(GLOBAL_CXXFLAGS) $(CXXFLAGS) $($@_CXXFLAGS) -MMD -MF $(basename $@).dep -MP + $(trace-cxx) $(CXX) -o $@ -c $< $(GLOBAL_CXXFLAGS) $(CXXFLAGS) $($@_CXXFLAGS) -MMD -MF $(call filename-to-dep, $@) -MP %.o: %.cpp - $(trace-cxx) $(CXX) -o $@ -c $< $(GLOBAL_CXXFLAGS) $(CXXFLAGS) $($@_CXXFLAGS) -MMD -MF $(basename $@).dep -MP + $(trace-cxx) $(CXX) -o $@ -c $< $(GLOBAL_CXXFLAGS) $(CXXFLAGS) $($@_CXXFLAGS) -MMD -MF $(call filename-to-dep, $@) -MP %.o: %.c - $(trace-cc) $(CC) -o $@ -c $< $(GLOBAL_CFLAGS) $(CFLAGS) $($@_CFLAGS) -MMD -MF $(basename $@).dep -MP + $(trace-cc) $(CC) -o $@ -c $< $(GLOBAL_CFLAGS) $(CFLAGS) $($@_CFLAGS) -MMD -MF $(call filename-to-dep, $@) -MP diff --git a/programs.mk b/programs.mk index c608a6f25a..0478e16d0b 100644 --- a/programs.mk +++ b/programs.mk @@ -53,10 +53,10 @@ define build-program = $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj): $$($(1)_COMMON_DEPS))) # Include .dep files, if they exist. - $(1)_DEPS := $$(addsuffix .dep, $$(basename $$(_srcs))) + $(1)_DEPS := $$(foreach fn, $$($(1)_OBJS), $$(call filename-to-dep, $$(fn))) -include $$($(1)_DEPS) programs_list += $$($(1)_PATH) - clean_files += $$($(1)_PATH) $$(_d)/*.o $$(_d)/*.dep $$($(1)_DEPS) $$($(1)_OBJS) + clean_files += $$($(1)_PATH) $$(_d)/*.o $$(_d)/.*.dep $$($(1)_DEPS) $$($(1)_OBJS) dist_files += $$(_srcs) endef From 35107038f7c726f5ef8d7ab014ad45c73970e65d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 1 Feb 2014 11:47:34 +0100 Subject: [PATCH 77/89] Support adding "make help" text --- clean.mk | 4 ++++ lib.mk | 19 ++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/clean.mk b/clean.mk index f45d578aa4..51bfd3bca3 100644 --- a/clean.mk +++ b/clean.mk @@ -5,3 +5,7 @@ clean: dryclean: @for i in $(clean_files); do if [ -e $$i ]; then echo $$i; fi; done | sort + +print-top-help += \ + echo " clean: Delete generated files"; \ + echo " dryclean: Show what files would be deleted by 'make clean'"; diff --git a/lib.mk b/lib.mk index f43fdd56c4..649c3b5018 100644 --- a/lib.mk +++ b/lib.mk @@ -79,7 +79,7 @@ $(foreach test, $(INSTALL_TESTS), $(eval $(call run-install-test,$(test)))) $(foreach file, $(man-pages), $(eval $(call install-data-in, $(file), $(mandir)/man$(patsubst .%,%,$(suffix $(file)))))) -.PHONY: all man help +.PHONY: default all man help all: $(programs_list) $(libs_list) $(jars_list) $(man-pages) @@ -90,15 +90,10 @@ help: @echo "The following targets are available:" @echo "" @echo " default: Build default targets" - @echo " install: Install into \$$(prefix) (currently set to '$(prefix)')" - @echo " clean: Delete generated files" - @echo " dryclean: Show what files would be deleted by 'make clean'" -ifdef PACKAGE_NAME - @echo " dist: Generate a source distribution" -endif ifdef man-pages @echo " man: Generate manual pages" endif + @$(print-top-help) ifdef programs_list @echo "" @echo "The following programs can be built:" @@ -117,3 +112,13 @@ ifdef jars_list @echo "" @for i in $(jars_list); do echo " $$i"; done endif + @echo "" + @echo "The following variables control the build:" + @echo "" + @echo " BUILD_SHARED_LIBS ($(BUILD_SHARED_LIBS)): Whether to build shared libraries" + @echo " BUILD_DEBUG ($(BUILD_DEBUG)): Whether to include debug symbols" + @echo " CC ($(CC)): C compiler to be used" + @echo " CFLAGS: Flags for the C compiler" + @echo " CXX ($(CXX)): C++ compiler to be used" + @echo " CXXFLAGS: Flags for the C++ compiler" + @$(print-var-help) From ec1738589a3aa1dd59e476de09ae2721d51b3e6e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 1 Feb 2014 12:20:06 +0100 Subject: [PATCH 78/89] Make variable names more regular --- clean.mk | 6 +++--- dist.mk | 12 ++++++------ jars.mk | 4 ++-- lib.mk | 37 +++++++++++++++++++------------------ libraries.mk | 8 ++++---- programs.mk | 8 ++++---- templates.mk | 4 ++-- tests.mk | 6 +++--- 8 files changed, 43 insertions(+), 42 deletions(-) diff --git a/clean.mk b/clean.mk index 51bfd3bca3..ce9afb3b0d 100644 --- a/clean.mk +++ b/clean.mk @@ -1,10 +1,10 @@ -clean_files := +clean-files := clean: - $(suppress) rm -fv -- $(clean_files) + $(suppress) rm -fv -- $(clean-files) dryclean: - @for i in $(clean_files); do if [ -e $$i ]; then echo $$i; fi; done | sort + @for i in $(clean-files); do if [ -e $$i ]; then echo $$i; fi; done | sort print-top-help += \ echo " clean: Delete generated files"; \ diff --git a/dist.mk b/dist.mk index cd11463e8a..0ce4377ae4 100644 --- a/dist.mk +++ b/dist.mk @@ -1,15 +1,15 @@ ifdef PACKAGE_NAME -dist_name = $(PACKAGE_NAME)-$(PACKAGE_VERSION) +dist-name = $(PACKAGE_NAME)-$(PACKAGE_VERSION) -dist_files := +dist-files := -dist: $(dist_name).tar.bz2 +dist: $(dist-name).tar.bz2 -$(dist_name).tar.bz2: $(dist_files) - $(suppress) tar cvfj $@ $(dist_files) --transform 's,^,$(dist_name)/,' +$(dist-name).tar.bz2: $(dist-files) + $(suppress) tar cvfj $@ $(dist-files) --transform 's,^,$(dist-name)/,' -clean_files += $(dist_name).tar.bz2 +clean-files += $(dist-name).tar.bz2 print-top-help += echo " dist: Generate a source distribution"; diff --git a/jars.mk b/jars.mk index c8075cde16..9595c1c47f 100644 --- a/jars.mk +++ b/jars.mk @@ -22,8 +22,8 @@ define build-jar = install: $$($(1)_INSTALL_PATH) - jars_list += $$($(1)_PATH) + jars-list += $$($(1)_PATH) - clean_files += $$($(1)_PATH) + clean-files += $$($(1)_PATH) endef diff --git a/lib.mk b/lib.mk index 649c3b5018..d930b0ef3a 100644 --- a/lib.mk +++ b/lib.mk @@ -6,9 +6,10 @@ default: all # Initialise some variables. -bin_SCRIPTS := -noinst_SCRIPTS := +bin-scripts := +noinst-scripts := man-pages := +install-tests := OS = $(shell uname -s) @@ -64,24 +65,24 @@ define include-sub-makefile = include $(1) endef -$(foreach mf, $(SUBS), $(eval $(call include-sub-makefile, $(mf)))) +$(foreach mf, $(makefiles), $(eval $(call include-sub-makefile, $(mf)))) # Instantiate stuff. -$(foreach lib, $(LIBS), $(eval $(call build-library,$(lib)))) -$(foreach prog, $(PROGRAMS), $(eval $(call build-program,$(prog)))) -$(foreach jar, $(JARS), $(eval $(call build-jar,$(jar)))) -$(foreach script, $(bin_SCRIPTS), $(eval $(call install-program-in,$(script),$(bindir)))) -$(foreach script, $(bin_SCRIPTS), $(eval programs_list += $(script))) -$(foreach script, $(noinst_SCRIPTS), $(eval programs_list += $(script))) -$(foreach template, $(template_files), $(eval $(call instantiate-template,$(template)))) -$(foreach test, $(INSTALL_TESTS), $(eval $(call run-install-test,$(test)))) +$(foreach lib, $(libraries), $(eval $(call build-library,$(lib)))) +$(foreach prog, $(programs), $(eval $(call build-program,$(prog)))) +$(foreach jar, $(jars), $(eval $(call build-jar,$(jar)))) +$(foreach script, $(bin-scripts), $(eval $(call install-program-in,$(script),$(bindir)))) +$(foreach script, $(bin-scripts), $(eval programs-list += $(script))) +$(foreach script, $(noinst-scripts), $(eval programs-list += $(script))) +$(foreach template, $(template-files), $(eval $(call instantiate-template,$(template)))) +$(foreach test, $(install-tests), $(eval $(call run-install-test,$(test)))) $(foreach file, $(man-pages), $(eval $(call install-data-in, $(file), $(mandir)/man$(patsubst .%,%,$(suffix $(file)))))) .PHONY: default all man help -all: $(programs_list) $(libs_list) $(jars_list) $(man-pages) +all: $(programs-list) $(libs-list) $(jars-list) $(man-pages) man: $(man-pages) @@ -94,23 +95,23 @@ ifdef man-pages @echo " man: Generate manual pages" endif @$(print-top-help) -ifdef programs_list +ifdef programs-list @echo "" @echo "The following programs can be built:" @echo "" - @for i in $(programs_list); do echo " $$i"; done + @for i in $(programs-list); do echo " $$i"; done endif -ifdef libs_list +ifdef libs-list @echo "" @echo "The following libraries can be built:" @echo "" - @for i in $(libs_list); do echo " $$i"; done + @for i in $(libs-list); do echo " $$i"; done endif -ifdef jars_list +ifdef jars-list @echo "" @echo "The following JARs can be built:" @echo "" - @for i in $(jars_list); do echo " $$i"; done + @for i in $(jars-list); do echo " $$i"; done endif @echo "" @echo "The following variables control the build:" diff --git a/libraries.mk b/libraries.mk index 461a3e9a62..a6965325a6 100644 --- a/libraries.mk +++ b/libraries.mk @@ -1,4 +1,4 @@ -libs_list := +libs-list := ifeq ($(OS), Darwin) SO_EXT = dylib @@ -110,7 +110,7 @@ define build-library = $(1)_DEPS := $$(foreach fn, $$($(1)_OBJS), $$(call filename-to-dep, $$(fn))) -include $$($(1)_DEPS) - libs_list += $$($(1)_PATH) - clean_files += $$(_d)/*.a $$(_d)/*.$(SO_EXT) $$(_d)/*.o $$(_d)/.*.dep $$($(1)_DEPS) $$($(1)_OBJS) - dist_files += $$(_srcs) + libs-list += $$($(1)_PATH) + clean-files += $$(_d)/*.a $$(_d)/*.$(SO_EXT) $$(_d)/*.o $$(_d)/.*.dep $$($(1)_DEPS) $$($(1)_OBJS) + dist-files += $$(_srcs) endef diff --git a/programs.mk b/programs.mk index 0478e16d0b..30539d1290 100644 --- a/programs.mk +++ b/programs.mk @@ -1,4 +1,4 @@ -programs_list := +programs-list := # Build a program with symbolic name $(1). The program is defined by # various variables prefixed by ‘$(1)_’: @@ -56,7 +56,7 @@ define build-program = $(1)_DEPS := $$(foreach fn, $$($(1)_OBJS), $$(call filename-to-dep, $$(fn))) -include $$($(1)_DEPS) - programs_list += $$($(1)_PATH) - clean_files += $$($(1)_PATH) $$(_d)/*.o $$(_d)/.*.dep $$($(1)_DEPS) $$($(1)_OBJS) - dist_files += $$(_srcs) + programs-list += $$($(1)_PATH) + clean-files += $$($(1)_PATH) $$(_d)/*.o $$(_d)/.*.dep $$($(1)_DEPS) $$($(1)_OBJS) + dist-files += $$(_srcs) endef diff --git a/templates.mk b/templates.mk index 82f9d60255..6d7b1034c4 100644 --- a/templates.mk +++ b/templates.mk @@ -1,10 +1,10 @@ -template_files := +template-files := # Create the file $(1) from $(1).in by running config.status (which # substitutes all ‘@var@’ variables set by the configure script). define instantiate-template = - clean_files += $(1) + clean-files += $(1) endef diff --git a/tests.mk b/tests.mk index 8a3bff66e8..339abd5803 100644 --- a/tests.mk +++ b/tests.mk @@ -6,15 +6,15 @@ define run-install-test = # Run the test in its own directory to mimick Automake behaviour. $1.run: $1 $(_PREV_TEST) - _installcheck_list += $1 + _installcheck-list += $1 endef installcheck: install - @total=0; failed=0; for i in $(_installcheck_list); do \ + @total=0; failed=0; for i in $(_installcheck-list); do \ total=$$((total + 1)); \ echo "running test $$i"; \ - if (cd $$(dirname $$i) && $(TESTS_ENVIRONMENT) $$(basename $$i)); then \ + if (cd $$(dirname $$i) && $(tests-environment) $$(basename $$i)); then \ echo "PASS: $$i"; \ else \ echo "FAIL: $$i"; \ From 16e7d692092449263880ee795ec419cecbe22d24 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 1 Feb 2014 12:23:14 +0100 Subject: [PATCH 79/89] Update Makefile variable names --- Makefile | 2 +- corepkgs/local.mk | 2 +- doc/manual/local.mk | 8 ++++---- perl/local.mk | 6 +++--- scripts/local.mk | 8 ++++---- src/boost/format/local.mk | 2 +- src/bsdiff-4.3/local.mk | 4 ++-- src/libexpr/local.mk | 2 +- src/libmain/local.mk | 2 +- src/libstore/local.mk | 2 +- src/libutil/local.mk | 2 +- src/nix-daemon/local.mk | 2 +- src/nix-env/local.mk | 2 +- src/nix-hash/local.mk | 2 +- src/nix-instantiate/local.mk | 2 +- src/nix-log2xml/local.mk | 2 +- src/nix-store/local.mk | 2 +- tests/local.mk | 6 +++--- 18 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Makefile b/Makefile index f22a70a81c..df72578cc5 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -SUBS = \ +makefiles = \ src/boost/format/local.mk \ src/libutil/local.mk \ src/libstore/local.mk \ diff --git a/corepkgs/local.mk b/corepkgs/local.mk index a04e3e3fbc..19c1d06962 100644 --- a/corepkgs/local.mk +++ b/corepkgs/local.mk @@ -2,4 +2,4 @@ corepkgs_FILES = nar.nix buildenv.nix buildenv.pl unpack-channel.nix derivation. $(foreach file,config.nix $(corepkgs_FILES),$(eval $(call install-data-in,$(d)/$(file),$(datadir)/nix/corepkgs))) -template_files += $(d)/config.nix +template-files += $(d)/config.nix diff --git a/doc/manual/local.mk b/doc/manual/local.mk index ae3a9df5c8..8d49e1e4d5 100644 --- a/doc/manual/local.mk +++ b/doc/manual/local.mk @@ -26,7 +26,7 @@ $(d)/manual.is-valid: $(d)/manual.xmli $(xmllint) --nonet --noout --relaxng $(docbookrng)/docbook.rng - @touch $@ -clean_files += $(d)/manual.xmli $(d)/version.txt $(d)/manual.is-valid +clean-files += $(d)/manual.xmli $(d)/version.txt $(d)/manual.is-valid # Generate man pages. @@ -43,7 +43,7 @@ $(man-pages): $(d)/manual.xmli $(d)/manual.is-valid $(docbookxsl)/profiling/profile.xsl $< 2> /dev/null | \ (cd doc/manual && $(XSLTPROC) $(docbookxsl)/manpages/docbook.xsl -) -clean_files += $(d)/*.1 $(d)/*.5 $(d)/*.8 +clean-files += $(d)/*.1 $(d)/*.5 $(d)/*.8 # Generate the HTML manual. @@ -62,7 +62,7 @@ $(eval $(call install-symlink, manual.html, $(docdir)/manual/index.html)) all: $(d)/manual.html -clean_files += $(d)/manual.html +clean-files += $(d)/manual.html # Generate the PDF manual. @@ -76,4 +76,4 @@ $(d)/manual.pdf: $(d)/manual.xml $(MANUAL_SRCS) $(d)/manual.is-valid exit 1; \ fi -clean_files += $(d)/manual.pdf +clean-files += $(d)/manual.pdf diff --git a/perl/local.mk b/perl/local.mk index cd07631ca8..b5550cc9f8 100644 --- a/perl/local.mk +++ b/perl/local.mk @@ -17,7 +17,7 @@ ifeq ($(perlbindings), yes) $(d)/lib/Nix/Store.cc: $(d)/lib/Nix/Store.xs xsubpp $^ -output $@ - LIBS += Store + libraries += Store Store_DIR := $(d)/lib/Nix @@ -37,6 +37,6 @@ ifeq ($(perlbindings), yes) endif -clean_files += $(d)/lib/Nix/Config.pm $(d)/lib/Nix/Store.cc +clean-files += $(d)/lib/Nix/Config.pm $(d)/lib/Nix/Store.cc -dist_files += $(nix_perl_sources) +dist-files += $(nix_perl_sources) diff --git a/scripts/local.mk b/scripts/local.mk index 2805128db8..606b73df6c 100644 --- a/scripts/local.mk +++ b/scripts/local.mk @@ -9,7 +9,7 @@ nix_bin_scripts := \ $(d)/nix-pull \ $(d)/nix-push -bin_SCRIPTS += $(nix_bin_scripts) +bin-scripts += $(nix_bin_scripts) nix_substituters := \ $(d)/copy-from-other-stores.pl \ @@ -24,7 +24,7 @@ nix_noinst_scripts := \ $(d)/nix-reduce-build \ $(nix_substituters) -noinst_SCRIPTS += $(nix_noinst_scripts) +noinst-scripts += $(nix_noinst_scripts) profiledir = $(sysconfdir)/profile.d @@ -34,6 +34,6 @@ $(eval $(call install-program-in, $(d)/build-remote.pl, $(libexecdir)/nix)) $(foreach prog, $(nix_substituters), $(eval $(call install-program-in, $(prog), $(libexecdir)/nix/substituters))) $(eval $(call install-symlink, nix-build, $(bindir)/nix-shell)) -clean_files += $(nix_bin_scripts) $(nix_noinst_scripts) +clean-files += $(nix_bin_scripts) $(nix_noinst_scripts) -dist_files += $(d)/*.in +dist-files += $(d)/*.in diff --git a/src/boost/format/local.mk b/src/boost/format/local.mk index 17897fa590..3776eff382 100644 --- a/src/boost/format/local.mk +++ b/src/boost/format/local.mk @@ -1,4 +1,4 @@ -LIBS += libformat +libraries += libformat libformat_NAME = libnixformat diff --git a/src/bsdiff-4.3/local.mk b/src/bsdiff-4.3/local.mk index aca1ac1162..320795a94c 100644 --- a/src/bsdiff-4.3/local.mk +++ b/src/bsdiff-4.3/local.mk @@ -1,4 +1,4 @@ -PROGRAMS += bsdiff bspatch +programs += bsdiff bspatch bsdiff_DIR := $(d) bsdiff_SOURCES := $(d)/bsdiff.c @@ -10,4 +10,4 @@ bspatch_SOURCES := $(d)/bspatch.c bspatch_LDFLAGS = -lbz2 $(bsddiff_compat_include) bspatch_INSTALL_DIR = $(libexecdir)/nix -dist_files += $(d)/compat-include/* +dist-files += $(d)/compat-include/* diff --git a/src/libexpr/local.mk b/src/libexpr/local.mk index de276aa652..ff35155b1a 100644 --- a/src/libexpr/local.mk +++ b/src/libexpr/local.mk @@ -1,4 +1,4 @@ -LIBS += libexpr +libraries += libexpr libexpr_NAME = libnixexpr diff --git a/src/libmain/local.mk b/src/libmain/local.mk index 0efeee5314..71a07d1979 100644 --- a/src/libmain/local.mk +++ b/src/libmain/local.mk @@ -1,4 +1,4 @@ -LIBS += libmain +libraries += libmain libmain_NAME = libnixmain diff --git a/src/libstore/local.mk b/src/libstore/local.mk index dcedd4c26a..a9ae532700 100644 --- a/src/libstore/local.mk +++ b/src/libstore/local.mk @@ -1,4 +1,4 @@ -LIBS += libstore +libraries += libstore libstore_NAME = libnixstore diff --git a/src/libutil/local.mk b/src/libutil/local.mk index 83bd05f281..8af2e78d9c 100644 --- a/src/libutil/local.mk +++ b/src/libutil/local.mk @@ -1,4 +1,4 @@ -LIBS += libutil +libraries += libutil libutil_NAME = libnixutil diff --git a/src/nix-daemon/local.mk b/src/nix-daemon/local.mk index d02f9f6ce2..db071a3f7c 100644 --- a/src/nix-daemon/local.mk +++ b/src/nix-daemon/local.mk @@ -1,4 +1,4 @@ -PROGRAMS += nix-daemon +programs += nix-daemon nix-daemon_DIR := $(d) diff --git a/src/nix-env/local.mk b/src/nix-env/local.mk index 5a38d2fb76..e80719cd76 100644 --- a/src/nix-env/local.mk +++ b/src/nix-env/local.mk @@ -1,4 +1,4 @@ -PROGRAMS += nix-env +programs += nix-env nix-env_DIR := $(d) diff --git a/src/nix-hash/local.mk b/src/nix-hash/local.mk index 062e4d13b2..7c290ca846 100644 --- a/src/nix-hash/local.mk +++ b/src/nix-hash/local.mk @@ -1,4 +1,4 @@ -PROGRAMS += nix-hash +programs += nix-hash nix-hash_DIR := $(d) diff --git a/src/nix-instantiate/local.mk b/src/nix-instantiate/local.mk index daa741eb7f..7d1bc5ec9d 100644 --- a/src/nix-instantiate/local.mk +++ b/src/nix-instantiate/local.mk @@ -1,4 +1,4 @@ -PROGRAMS += nix-instantiate +programs += nix-instantiate nix-instantiate_DIR := $(d) diff --git a/src/nix-log2xml/local.mk b/src/nix-log2xml/local.mk index 8467d1973b..46eb2e02ca 100644 --- a/src/nix-log2xml/local.mk +++ b/src/nix-log2xml/local.mk @@ -1,4 +1,4 @@ -PROGRAMS += nix-log2xml +programs += nix-log2xml nix-log2xml_DIR := $(d) diff --git a/src/nix-store/local.mk b/src/nix-store/local.mk index edd111b420..7f93e4c191 100644 --- a/src/nix-store/local.mk +++ b/src/nix-store/local.mk @@ -1,4 +1,4 @@ -PROGRAMS += nix-store +programs += nix-store nix-store_DIR := $(d) diff --git a/tests/local.mk b/tests/local.mk index 21ffd047f6..87f4e25e60 100644 --- a/tests/local.mk +++ b/tests/local.mk @@ -12,10 +12,10 @@ nix_tests = \ multiple-outputs.sh import-derivation.sh fetchurl.sh optimise-store.sh \ binary-cache.sh nix-profile.sh -INSTALL_TESTS += $(foreach x, $(nix_tests), tests/$(x)) +install-tests += $(foreach x, $(nix_tests), tests/$(x)) -TESTS_ENVIRONMENT = NIX_REMOTE= $(bash) -e +tests-environment = NIX_REMOTE= $(bash) -e -clean_files += $(d)/common.sh +clean-files += $(d)/common.sh installcheck: $(d)/common.sh From 0c6d62cf27b3b22fa60bddad16ea8e8d062e4a99 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 1 Feb 2014 12:26:38 +0100 Subject: [PATCH 80/89] Remove Automakefiles --- Makefile.am | 42 ------------ corepkgs/Makefile.am | 12 ---- doc/Makefile.am | 1 - doc/manual/Makefile.am | 117 -------------------------------- misc/Makefile.am | 1 - misc/emacs/Makefile.am | 5 -- perl/Makefile.am | 38 ----------- scripts/Makefile.am | 41 ----------- src/Makefile.am | 3 - src/boost/format/Makefile.am | 12 ---- src/bsdiff-4.3/Makefile.am | 13 ---- src/libexpr/Makefile.am | 40 ----------- src/libmain/Makefile.am | 11 --- src/libstore/Makefile.am | 33 --------- src/libutil/Makefile.am | 18 ----- src/nix-daemon/Makefile.am | 12 ---- src/nix-env/Makefile.am | 12 ---- src/nix-hash/Makefile.am | 8 --- src/nix-instantiate/Makefile.am | 10 --- src/nix-log2xml/Makefile.am | 17 ----- src/nix-store/Makefile.am | 12 ---- tests/Makefile.am | 52 -------------- 22 files changed, 510 deletions(-) delete mode 100644 Makefile.am delete mode 100644 corepkgs/Makefile.am delete mode 100644 doc/Makefile.am delete mode 100644 doc/manual/Makefile.am delete mode 100644 misc/Makefile.am delete mode 100644 misc/emacs/Makefile.am delete mode 100644 perl/Makefile.am delete mode 100644 scripts/Makefile.am delete mode 100644 src/Makefile.am delete mode 100644 src/boost/format/Makefile.am delete mode 100644 src/bsdiff-4.3/Makefile.am delete mode 100644 src/libexpr/Makefile.am delete mode 100644 src/libmain/Makefile.am delete mode 100644 src/libstore/Makefile.am delete mode 100644 src/libutil/Makefile.am delete mode 100644 src/nix-daemon/Makefile.am delete mode 100644 src/nix-env/Makefile.am delete mode 100644 src/nix-hash/Makefile.am delete mode 100644 src/nix-instantiate/Makefile.am delete mode 100644 src/nix-log2xml/Makefile.am delete mode 100644 src/nix-store/Makefile.am delete mode 100644 tests/Makefile.am diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index d3ef224de3..0000000000 --- a/Makefile.am +++ /dev/null @@ -1,42 +0,0 @@ -SUBDIRS = src perl scripts corepkgs doc misc tests -EXTRA_DIST = substitute.mk nix.spec nix.spec.in bootstrap.sh \ - NEWS version misc/systemd/nix-daemon.service - -pkginclude_HEADERS = config.h - -include ./substitute.mk - -nix.spec: nix.spec.in - -install-data-local: init-state - $(INSTALL) -d $(DESTDIR)$(sysconfdir)/nix - $(INSTALL) -d $(DESTDIR)$(docdir) - $(INSTALL_DATA) README $(DESTDIR)$(docdir)/ - -if INIT_STATE - -# For setuid operation, you can enable the following: -# INIT_FLAGS = -g @NIX_GROUP@ -o @NIX_USER@ -# GROUP_WRITABLE = -m 775 - -init-state: - $(INSTALL) $(INIT_FLAGS) -d $(DESTDIR)$(localstatedir)/nix - $(INSTALL) $(INIT_FLAGS) -d $(DESTDIR)$(localstatedir)/nix/db - $(INSTALL) $(INIT_FLAGS) -d $(DESTDIR)$(localstatedir)/log/nix - $(INSTALL) $(INIT_FLAGS) -d $(DESTDIR)$(localstatedir)/log/nix/drvs - $(INSTALL) $(INIT_FLAGS) -d $(DESTDIR)$(localstatedir)/nix/profiles - $(INSTALL) $(INIT_FLAGS) -d $(DESTDIR)$(localstatedir)/nix/gcroots - $(INSTALL) $(INIT_FLAGS) -d $(DESTDIR)$(localstatedir)/nix/temproots - $(INSTALL) $(INIT_FLAGS) -d $(DESTDIR)$(localstatedir)/nix/userpool - -$(INSTALL) $(INIT_FLAGS) -d $(DESTDIR)$(storedir) - $(INSTALL) $(INIT_FLAGS) $(GROUP_WRITABLE) -d $(DESTDIR)$(localstatedir)/nix/manifests - -else - -init-state: - -endif - -NEWS: - $(MAKE) -C doc/manual NEWS.txt - cp $(srcdir)/doc/manual/NEWS.txt NEWS diff --git a/corepkgs/Makefile.am b/corepkgs/Makefile.am deleted file mode 100644 index 111b667d0b..0000000000 --- a/corepkgs/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -all-local: config.nix - -files = nar.nix buildenv.nix buildenv.pl unpack-channel.nix derivation.nix fetchurl.nix \ - imported-drv-to-derivation.nix - -install-exec-local: - $(INSTALL) -d $(DESTDIR)$(datadir)/nix/corepkgs - $(INSTALL_DATA) config.nix $(files) $(DESTDIR)$(datadir)/nix/corepkgs - -include ../substitute.mk - -EXTRA_DIST = config.nix.in $(files) diff --git a/doc/Makefile.am b/doc/Makefile.am deleted file mode 100644 index e76efafdb8..0000000000 --- a/doc/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = manual diff --git a/doc/manual/Makefile.am b/doc/manual/Makefile.am deleted file mode 100644 index 56be7e1b88..0000000000 --- a/doc/manual/Makefile.am +++ /dev/null @@ -1,117 +0,0 @@ -XMLLINT = $(xmllint) --nonet $(xmlflags) -XSLTPROC = $(xsltproc) --nonet $(xmlflags) \ - --param section.autolabel 1 \ - --param section.label.includes.component.label 1 \ - --param html.stylesheet \'style.css\' \ - --param xref.with.number.and.title 1 \ - --param toc.section.depth 3 \ - --param admon.style \'\' \ - --param callout.graphics.extension \'.gif\' \ - --param contrib.inline.enabled 0 - -dblatex_opts = \ - -P doc.collab.show=0 \ - -P latex.output.revhistory=0 - -# Note: we use GIF for now, since the PNGs shipped with Docbook aren't -# transparent. - -man1_MANS = nix-env.1 nix-build.1 nix-shell.1 nix-store.1 nix-instantiate.1 \ - nix-collect-garbage.1 nix-push.1 nix-pull.1 \ - nix-prefetch-url.1 nix-channel.1 \ - nix-install-package.1 nix-hash.1 nix-copy-closure.1 - -man5_MANS = nix.conf.5 - -man8_MANS = nix-daemon.8 - -FIGURES = figures/user-environments.png - -MANUAL_SRCS = manual.xml introduction.xml installation.xml \ - package-management.xml writing-nix-expressions.xml builtins.xml \ - build-farm.xml \ - $(man1_MANS:.1=.xml) $(man8_MANS:.8=.xml) \ - troubleshooting.xml bugs.xml opt-common.xml opt-common-syn.xml opt-inst-syn.xml \ - env-common.xml quick-start.xml nix-lang-ref.xml glossary.xml \ - conf-file.xml release-notes.xml \ - style.css images - -# Do XInclude processing. -manual.xmli: $(MANUAL_SRCS) version.txt - $(XMLLINT) --xinclude $< -o $@.tmp - mv $@.tmp $@ - -# Note: RelaxNG validation requires xmllint >= 2.7.4. -manual.is-valid: manual.xmli - $(XSLTPROC) --novalid --stringparam profile.condition manual \ - $(docbookxsl)/profiling/profile.xsl $< 2> /dev/null | \ - $(XMLLINT) --noout --relaxng $(docbookrng)/docbook.rng - - touch $@ - -version.txt: - echo -n $(VERSION) > version.txt - -man $(MANS): manual.is-valid - $(XSLTPROC) --stringparam profile.condition manpage \ - $(docbookxsl)/profiling/profile.xsl manual.xmli 2> /dev/null | \ - $(XSLTPROC) $(docbookxsl)/manpages/docbook.xsl - - -manual.html: $(MANUAL_SRCS) manual.is-valid images - $(XSLTPROC) --xinclude --stringparam profile.condition manual \ - $(docbookxsl)/profiling/profile.xsl manual.xml | \ - $(XSLTPROC) --output manual.html $(docbookxsl)/html/docbook.xsl - - -manual.pdf: $(MANUAL_SRCS) manual.is-valid images - if test "$(dblatex)" != ""; then \ - $(XSLTPROC) --xinclude --stringparam profile.condition manual \ - $(docbookxsl)/profiling/profile.xsl manual.xml | \ - $(dblatex) -o manual.pdf $(dblatex_opts) -; \ - else \ - echo "Please install dblatex and rerun configure."; \ - exit 1; \ - fi - - -NEWS_OPTS = \ - --stringparam generate.toc "article nop" \ - --stringparam section.autolabel.max.depth 0 \ - --stringparam header.rule 0 - -NEWS.html: release-notes.xml - $(XSLTPROC) --xinclude --output $@ $(NEWS_OPTS) \ - $(docbookxsl)/html/docbook.xsl release-notes.xml - -NEWS.txt: release-notes.xml - $(XSLTPROC) --xinclude quote-literals.xsl release-notes.xml | \ - $(XSLTPROC) --output $@.tmp.html $(NEWS_OPTS) \ - $(docbookxsl)/html/docbook.xsl - - LANG=en_US $(w3m) -dump $@.tmp.html > $@ - rm $@.tmp.html - - -all-local: manual.html NEWS.html NEWS.txt - -install-data-local: manual.html - $(INSTALL) -d $(DESTDIR)$(docdir)/manual - $(INSTALL_DATA) manual.html $(DESTDIR)$(docdir)/manual - ln -sf manual.html $(DESTDIR)$(docdir)/manual/index.html - $(INSTALL_DATA) style.css $(DESTDIR)$(docdir)/manual - cp -r images $(DESTDIR)$(docdir)/manual/images - $(INSTALL) -d $(DESTDIR)$(docdir)/manual/figures - $(INSTALL_DATA) $(FIGURES) $(DESTDIR)$(docdir)/manual/figures - $(INSTALL) -d $(DESTDIR)$(docdir)/release-notes - $(INSTALL_DATA) NEWS.html $(DESTDIR)$(docdir)/release-notes/index.html - $(INSTALL_DATA) style.css $(DESTDIR)$(docdir)/release-notes/ - -images: - mkdir images -# cp $(docbookxsl)/images/*.gif images - mkdir images/callouts - cp $(docbookxsl)/images/callouts/*.gif images/callouts - chmod -R +w images - -KEEP = manual.html manual.xmli manual.is-valid version.txt $(MANS) NEWS.html NEWS.txt - -EXTRA_DIST = $(MANUAL_SRCS) $(FIGURES) $(KEEP) - -DISTCLEANFILES = $(KEEP) diff --git a/misc/Makefile.am b/misc/Makefile.am deleted file mode 100644 index ef10d1e981..0000000000 --- a/misc/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = emacs diff --git a/misc/emacs/Makefile.am b/misc/emacs/Makefile.am deleted file mode 100644 index 49f19fe506..0000000000 --- a/misc/emacs/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -EXTRA_DIST = nix-mode.el - -install-data-local: - $(INSTALL) -d $(DESTDIR)$(datadir)/emacs/site-lisp - $(INSTALL_DATA) $(srcdir)/nix-mode.el $(DESTDIR)$(datadir)/emacs/site-lisp diff --git a/perl/Makefile.am b/perl/Makefile.am deleted file mode 100644 index b8e60bc2dc..0000000000 --- a/perl/Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ -PERL_MODULES = lib/Nix/Store.pm lib/Nix/Manifest.pm lib/Nix/GeneratePatches.pm lib/Nix/SSH.pm lib/Nix/CopyClosure.pm lib/Nix/Config.pm.in lib/Nix/Utils.pm lib/Nix/Crypto.pm - -all: $(PERL_MODULES:.in=) - -install-exec-local: $(PERL_MODULES:.in=) install-perl-xs - $(INSTALL) -d $(DESTDIR)$(perllibdir)/Nix - $(INSTALL_DATA) $(PERL_MODULES:.in=) $(DESTDIR)$(perllibdir)/Nix - -if PERL_BINDINGS -install-perl-xs: - $(INSTALL) -d $(DESTDIR)$(perllibdir)/auto/Nix/Store - ln -sfn $(pkglibdir)/libNixStore$(dynlib_suffix) $(DESTDIR)$(perllibdir)/auto/Nix/Store/Store$(dynlib_suffix) - -# Awful hackery to get libtool to build Perl XS bindings. -pkglib_LTLIBRARIES = libNixStore.la - -nodist_libNixStore_la_SOURCES = lib/Nix/Store.cc - -CLEANFILES = lib/Nix/Store.cc - -libNixStore_la_LIBADD = $(top_builddir)/src/libstore/libstore.la - -AM_CXXFLAGS = \ - -I$(top_srcdir)/src -I$(top_srcdir)/src/libutil -I$(top_srcdir)/src/libstore \ - -I$(shell $(perl) -e 'use Config; print $$Config{archlibexp};')/CORE \ - -D_FILE_OFFSET_BITS=64 - -lib/Nix/Store.cc: lib/Nix/Store.xs - $(INSTALL) -d lib/Nix - xsubpp $^ -output $@ - -else -install-perl-xs: -endif - -EXTRA_DIST = $(PERL_MODULES) lib/Nix/Store.xs - -include ../substitute.mk diff --git a/scripts/Makefile.am b/scripts/Makefile.am deleted file mode 100644 index d9f39aad1b..0000000000 --- a/scripts/Makefile.am +++ /dev/null @@ -1,41 +0,0 @@ -bin_SCRIPTS = nix-collect-garbage \ - nix-pull nix-push nix-prefetch-url \ - nix-install-package nix-channel nix-build \ - nix-copy-closure nix-generate-patches - -noinst_SCRIPTS = nix-profile.sh \ - find-runtime-roots.pl build-remote.pl nix-reduce-build \ - copy-from-other-stores.pl nix-http-export.cgi - -profiledir = $(sysconfdir)/profile.d - -install-exec-local: download-using-manifests.pl copy-from-other-stores.pl download-from-binary-cache.pl find-runtime-roots.pl - $(INSTALL) -d $(DESTDIR)$(profiledir) - $(INSTALL_DATA) nix-profile.sh $(DESTDIR)$(profiledir)/nix.sh - $(INSTALL) -d $(DESTDIR)$(libexecdir)/nix - $(INSTALL_PROGRAM) find-runtime-roots.pl $(DESTDIR)$(libexecdir)/nix - $(INSTALL_PROGRAM) build-remote.pl $(DESTDIR)$(libexecdir)/nix - $(INSTALL) -d $(DESTDIR)$(libexecdir)/nix/substituters - $(INSTALL_PROGRAM) download-using-manifests.pl copy-from-other-stores.pl download-from-binary-cache.pl $(DESTDIR)$(libexecdir)/nix/substituters - $(INSTALL) -d $(DESTDIR)$(sysconfdir)/nix - ln -sf nix-build $(DESTDIR)$(bindir)/nix-shell - -include ../substitute.mk - -EXTRA_DIST = nix-collect-garbage.in \ - nix-pull.in nix-push.in nix-profile.sh.in \ - nix-prefetch-url.in nix-install-package.in \ - nix-channel.in \ - nix-build.in \ - download-using-manifests.pl.in \ - copy-from-other-stores.pl.in \ - download-from-binary-cache.pl.in \ - nix-copy-closure.in \ - find-runtime-roots.pl.in \ - build-remote.pl.in \ - nix-reduce-build.in \ - nix-http-export.cgi.in \ - nix-generate-patches.in - -clean: - rm -f $(bin_SCRIPTS) $(noinst_SCRIPTS) diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index a5e411b9ed..0000000000 --- a/src/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -SUBDIRS = boost libutil libstore libmain nix-store nix-hash \ - libexpr nix-instantiate nix-env nix-daemon \ - nix-log2xml bsdiff-4.3 diff --git a/src/boost/format/Makefile.am b/src/boost/format/Makefile.am deleted file mode 100644 index 13e23d315d..0000000000 --- a/src/boost/format/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -pkglib_LTLIBRARIES = libformat.la - -libformat_la_SOURCES = format_implementation.cc free_funcs.cc \ - parsing.cc - -pkginclude_HEADERS = exceptions.hpp feed_args.hpp format_class.hpp \ - format_fwd.hpp group.hpp internals.hpp internals_fwd.hpp \ - macros_default.hpp - -pkgincludedir = ${includedir}/nix/boost/format - -AM_CXXFLAGS = -Wall -I$(srcdir)/../.. diff --git a/src/bsdiff-4.3/Makefile.am b/src/bsdiff-4.3/Makefile.am deleted file mode 100644 index 62315333a7..0000000000 --- a/src/bsdiff-4.3/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -EXTRA_DIST = compat-include - -libexec_PROGRAMS = bsdiff bspatch - -bsdiff_SOURCES = bsdiff.c - -bsdiff_LDADD = -lbz2 - -bspatch_SOURCES = bspatch.c - -bspatch_LDADD = -lbz2 - -AM_CFLAGS = -O3 ${bsddiff_compat_include} diff --git a/src/libexpr/Makefile.am b/src/libexpr/Makefile.am deleted file mode 100644 index 7edbe77157..0000000000 --- a/src/libexpr/Makefile.am +++ /dev/null @@ -1,40 +0,0 @@ -pkglib_LTLIBRARIES = libexpr.la - -libexpr_la_SOURCES = \ - nixexpr.cc eval.cc primops.cc lexer-tab.cc parser-tab.cc \ - get-drvs.cc attr-path.cc value-to-xml.cc value-to-json.cc \ - common-opts.cc names.cc - -pkginclude_HEADERS = \ - nixexpr.hh eval.hh eval-inline.hh lexer-tab.hh parser-tab.hh \ - get-drvs.hh attr-path.hh value-to-xml.hh value-to-json.hh \ - common-opts.hh names.hh symbol-table.hh value.hh - -libexpr_la_LIBADD = ../libutil/libutil.la ../libstore/libstore.la \ - ../boost/format/libformat.la @BDW_GC_LIBS@ - -BUILT_SOURCES = \ - parser-tab.hh lexer-tab.hh parser-tab.cc lexer-tab.cc - -EXTRA_DIST = lexer.l parser.y - -AM_CXXFLAGS = \ - -I$(srcdir)/.. \ - -I$(srcdir)/../libutil -I$(srcdir)/../libstore - - -# Parser generation. - -parser-tab.cc parser-tab.hh: parser.y - $(bison) -v -o parser-tab.cc $(srcdir)/parser.y -d - -lexer-tab.cc lexer-tab.hh: lexer.l - $(flex) --outfile lexer-tab.cc --header-file=lexer-tab.hh $(srcdir)/lexer.l - - -# SDF stuff (not built by default). -nix.tbl: nix.sdf - sdf2table -m Nix -s -i nix.sdf -o nix.tbl - -test.ast: test.nix nix.tbl - sglri -p nix.tbl -i test.nix -o test.ast diff --git a/src/libmain/Makefile.am b/src/libmain/Makefile.am deleted file mode 100644 index 75b9d83dcf..0000000000 --- a/src/libmain/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -pkglib_LTLIBRARIES = libmain.la - -libmain_la_SOURCES = shared.cc stack.cc - -libmain_la_LIBADD = ../libstore/libstore.la @BDW_GC_LIBS@ - -pkginclude_HEADERS = shared.hh - -AM_CXXFLAGS = \ - -I$(srcdir)/.. -I$(srcdir)/../libutil \ - -I$(srcdir)/../libstore diff --git a/src/libstore/Makefile.am b/src/libstore/Makefile.am deleted file mode 100644 index 3dfb1e0c3a..0000000000 --- a/src/libstore/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -pkglib_LTLIBRARIES = libstore.la - -libstore_la_SOURCES = \ - store-api.cc local-store.cc remote-store.cc derivations.cc build.cc misc.cc \ - globals.cc references.cc pathlocks.cc gc.cc \ - optimise-store.cc - -pkginclude_HEADERS = \ - store-api.hh local-store.hh remote-store.hh derivations.hh misc.hh \ - globals.hh references.hh pathlocks.hh \ - worker-protocol.hh - -libstore_la_LIBADD = ../libutil/libutil.la ../boost/format/libformat.la @SQLITE3_LIBS@ -lbz2 - -EXTRA_DIST = schema.sql - -AM_CXXFLAGS = -Wall \ - -I$(srcdir)/.. -I$(srcdir)/../libutil \ - -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_VERSION=\"$(VERSION)\" \ - -I$(srcdir)/.. -I$(srcdir)/../libutil \ - -I$(srcdir)/../libstore - -local-store.lo: schema.sql.hh - -%.sql.hh: %.sql - sed -e 's/"/\\"/g' -e 's/\(.*\)/"\1\\n"/' < $< > $@ || (rm $@ && exit 1) diff --git a/src/libutil/Makefile.am b/src/libutil/Makefile.am deleted file mode 100644 index 0c4073e66e..0000000000 --- a/src/libutil/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -pkglib_LTLIBRARIES = libutil.la - -libutil_la_SOURCES = util.cc hash.cc serialise.cc \ - archive.cc xml-writer.cc affinity.cc - -libutil_la_LIBADD = ../boost/format/libformat.la - -pkginclude_HEADERS = util.hh hash.hh serialise.hh \ - archive.hh xml-writer.hh types.hh affinity.hh - -if !HAVE_OPENSSL -libutil_la_SOURCES += \ - md5.c md5.h sha1.c sha1.h sha256.c sha256.h md32_common.h -else -libutil_la_LIBADD += @OPENSSL_LIBS@ -endif - -AM_CXXFLAGS = -Wall -I$(srcdir)/.. diff --git a/src/nix-daemon/Makefile.am b/src/nix-daemon/Makefile.am deleted file mode 100644 index b8e9f4a064..0000000000 --- a/src/nix-daemon/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -bin_PROGRAMS = nix-daemon - -nix_daemon_SOURCES = nix-daemon.cc -nix_daemon_LDADD = ../libmain/libmain.la ../libstore/libstore.la ../libutil/libutil.la \ - ../boost/format/libformat.la - -AM_CXXFLAGS = \ - -I$(srcdir)/.. -I$(srcdir)/../libutil \ - -I$(srcdir)/../libstore -I$(srcdir)/../libmain - -install-exec-local: - ln -sf nix-daemon $(DESTDIR)$(bindir)/nix-worker diff --git a/src/nix-env/Makefile.am b/src/nix-env/Makefile.am deleted file mode 100644 index 4d3bd111d7..0000000000 --- a/src/nix-env/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -bin_PROGRAMS = nix-env - -nix_env_SOURCES = nix-env.cc profiles.cc profiles.hh user-env.cc user-env.hh - -nix_env_LDADD = ../libmain/libmain.la ../libexpr/libexpr.la \ - ../libstore/libstore.la ../libutil/libutil.la \ - ../boost/format/libformat.la - -AM_CXXFLAGS = \ - -I$(srcdir)/.. \ - -I$(srcdir)/../libutil -I$(srcdir)/../libstore \ - -I$(srcdir)/../libexpr -I$(srcdir)/../libmain -I../libexpr diff --git a/src/nix-hash/Makefile.am b/src/nix-hash/Makefile.am deleted file mode 100644 index ef7bb84239..0000000000 --- a/src/nix-hash/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -bin_PROGRAMS = nix-hash - -nix_hash_SOURCES = nix-hash.cc -nix_hash_LDADD = ../libmain/libmain.la ../libstore/libstore.la ../libutil/libutil.la \ - ../boost/format/libformat.la - -AM_CXXFLAGS = \ - -I$(srcdir)/.. -I$(srcdir)/../libutil -I$(srcdir)/../libstore -I$(srcdir)/../libmain diff --git a/src/nix-instantiate/Makefile.am b/src/nix-instantiate/Makefile.am deleted file mode 100644 index 96978f36c5..0000000000 --- a/src/nix-instantiate/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -bin_PROGRAMS = nix-instantiate - -nix_instantiate_SOURCES = nix-instantiate.cc -nix_instantiate_LDADD = ../libmain/libmain.la ../libexpr/libexpr.la \ - ../libstore/libstore.la ../libutil/libutil.la \ - ../boost/format/libformat.la - -AM_CXXFLAGS = \ - -I$(srcdir)/.. -I$(srcdir)/../libutil -I$(srcdir)/../libstore \ - -I$(srcdir)/../libexpr -I$(srcdir)/../libmain -I../libexpr diff --git a/src/nix-log2xml/Makefile.am b/src/nix-log2xml/Makefile.am deleted file mode 100644 index c538fda080..0000000000 --- a/src/nix-log2xml/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -bin_PROGRAMS = nix-log2xml - -nix_log2xml_SOURCES = log2xml.cc - -%.xml: %.log nix-log2xml - ./nix-log2xml < $< > $@ - -%.html: %.xml mark-errors.xsl log2html.xsl - $(xsltproc) mark-errors.xsl $< | $(xsltproc) log2html.xsl - > $@ - -LOG2HTML = $(srcdir)/mark-errors.xsl $(srcdir)/log2html.xsl $(srcdir)/treebits.js - -EXTRA_DIST = $(LOG2HTML) - -install-data-local: - $(INSTALL) -d $(DESTDIR)$(datadir)/nix/log2html - $(INSTALL_DATA) $(LOG2HTML) $(DESTDIR)$(datadir)/nix/log2html diff --git a/src/nix-store/Makefile.am b/src/nix-store/Makefile.am deleted file mode 100644 index fca9eff7cd..0000000000 --- a/src/nix-store/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -bin_PROGRAMS = nix-store - -nix_store_SOURCES = \ - nix-store.cc dotgraph.cc dotgraph.hh \ - xmlgraph.cc xmlgraph.hh - -nix_store_LDADD = ../libmain/libmain.la ../libstore/libstore.la ../libutil/libutil.la \ - ../boost/format/libformat.la -lbz2 - -AM_CXXFLAGS = \ - -I$(srcdir)/.. -I$(srcdir)/../libutil \ - -I$(srcdir)/../libstore -I$(srcdir)/../libmain diff --git a/tests/Makefile.am b/tests/Makefile.am deleted file mode 100644 index 38cf7b1bda..0000000000 --- a/tests/Makefile.am +++ /dev/null @@ -1,52 +0,0 @@ -TESTS_ENVIRONMENT = NIX_REMOTE= $(bash) -e - -extra1 = $(shell pwd)/test-tmp/shared - -TESTS = init.sh hash.sh lang.sh add.sh simple.sh dependencies.sh \ - parallel.sh build-hook.sh substitutes.sh substitutes2.sh \ - fallback.sh nix-push.sh gc.sh gc-concurrent.sh verify.sh nix-pull.sh \ - referrers.sh user-envs.sh logging.sh nix-build.sh misc.sh fixed.sh \ - gc-runtime.sh install-package.sh check-refs.sh filter-source.sh \ - remote-store.sh export.sh export-graph.sh negative-caching.sh \ - binary-patching.sh timeout.sh secure-drv-outputs.sh nix-channel.sh \ - multiple-outputs.sh import-derivation.sh fetchurl.sh optimise-store.sh \ - binary-cache.sh nix-profile.sh - -XFAIL_TESTS = - -profiledir = $(sysconfdir)/profile.d - -include ../substitute.mk - -$(TESTS): common.sh config.nix - -EXTRA_DIST = $(TESTS) \ - config.nix.in \ - simple.nix simple.builder.sh \ - hash-check.nix \ - dependencies.nix dependencies.builder*.sh \ - parallel.nix parallel.builder.sh \ - build-hook.nix build-hook.hook.sh \ - substituter.sh substituter2.sh \ - gc-concurrent.nix gc-concurrent.builder.sh gc-concurrent2.builder.sh \ - user-envs.nix user-envs.builder.sh \ - fixed.nix fixed.builder1.sh fixed.builder2.sh \ - gc-runtime.nix \ - check-refs.nix \ - filter-source.nix \ - export-graph.nix \ - negative-caching.nix \ - binary-patching.nix \ - timeout.nix timeout.builder.sh \ - secure-drv-outputs.nix \ - multiple-outputs.nix \ - import-derivation.nix \ - fetchurl.nix \ - $(wildcard lang/*.nix) $(wildcard lang/*.exp) $(wildcard lang/*.exp.xml) $(wildcard lang/*.flags) $(wildcard lang/dir*/*.nix) \ - common.sh.in - -# Hacky. -check-am: - @echo "Warning: Nix has no 'make check'. Please install Nix and run 'make installcheck' instead." - -installcheck: check-TESTS From 6f8aa145d43d0453d74e70d1d33cfa6e21fddf89 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 1 Feb 2014 14:22:08 +0100 Subject: [PATCH 81/89] Improve "make dist" --- dist.mk | 11 ++++++----- lib.mk | 5 ++++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dist.mk b/dist.mk index 0ce4377ae4..794b277713 100644 --- a/dist.mk +++ b/dist.mk @@ -2,14 +2,15 @@ ifdef PACKAGE_NAME dist-name = $(PACKAGE_NAME)-$(PACKAGE_VERSION) -dist-files := - -dist: $(dist-name).tar.bz2 +dist: $(dist-name).tar.bz2 $(dist-name).tar.xz $(dist-name).tar.bz2: $(dist-files) - $(suppress) tar cvfj $@ $(dist-files) --transform 's,^,$(dist-name)/,' + $(trace-gen) tar cfj $@ $(sort $(dist-files)) --transform 's,^,$(dist-name)/,' -clean-files += $(dist-name).tar.bz2 +$(dist-name).tar.xz: $(dist-files) + $(trace-gen) tar cfJ $@ $(sort $(dist-files)) --transform 's,^,$(dist-name)/,' + +clean-files += $(dist-name).tar.bz2 $(dist-name).tar.xz print-top-help += echo " dist: Generate a source distribution"; diff --git a/lib.mk b/lib.mk index d930b0ef3a..6e02bc9129 100644 --- a/lib.mk +++ b/lib.mk @@ -10,6 +10,7 @@ bin-scripts := noinst-scripts := man-pages := install-tests := +dist-files := OS = $(shell uname -s) @@ -49,7 +50,6 @@ endif include mk/functions.mk include mk/tracing.mk include mk/clean.mk -include mk/dist.mk include mk/install.mk include mk/libraries.mk include mk/programs.mk @@ -80,6 +80,9 @@ $(foreach test, $(install-tests), $(eval $(call run-install-test,$(test)))) $(foreach file, $(man-pages), $(eval $(call install-data-in, $(file), $(mandir)/man$(patsubst .%,%,$(suffix $(file)))))) +include mk/dist.mk + + .PHONY: default all man help all: $(programs-list) $(libs-list) $(jars-list) $(man-pages) From 1eff3ad37fdb9dcf9f8528fdacea0ebf0e79d545 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 1 Feb 2014 14:36:44 +0100 Subject: [PATCH 82/89] Add missing file --- functions.mk | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 functions.mk diff --git a/functions.mk b/functions.mk new file mode 100644 index 0000000000..51f6457016 --- /dev/null +++ b/functions.mk @@ -0,0 +1,7 @@ +# Utility function for recursively finding files, e.g. +# ‘$(call rwildcard, path/to/dir, *.c *.h)’. +rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d)) + +# Given a file name, produce the corresponding dependency file +# (e.g. ‘foo/bar.o’ becomes ‘foo/.bar.o.dep’). +filename-to-dep = $(dir $1).$(notdir $1).dep From 6ef32bddc1f10034322966b3a5b85af7b9cdc4d8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 1 Feb 2014 14:28:31 +0100 Subject: [PATCH 83/89] Fix "make dist" --- Makefile | 3 +-- doc/manual/local.mk | 5 +++++ local.mk | 3 +++ perl/local.mk | 4 +--- release.nix | 5 ++--- scripts/local.mk | 2 -- src/bsdiff-4.3/local.mk | 2 -- src/libexpr/local.mk | 6 ++++-- src/libstore/local.mk | 4 +++- 9 files changed, 19 insertions(+), 15 deletions(-) create mode 100644 local.mk diff --git a/Makefile b/Makefile index df72578cc5..0ad6bb236c 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ makefiles = \ + local.mk \ src/boost/format/local.mk \ src/libutil/local.mk \ src/libstore/local.mk \ @@ -18,8 +19,6 @@ makefiles = \ doc/manual/local.mk \ tests/local.mk -GLOBAL_CXXFLAGS = -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr - include Makefile.config include mk/lib.mk diff --git a/doc/manual/local.mk b/doc/manual/local.mk index 8d49e1e4d5..92413eb7e2 100644 --- a/doc/manual/local.mk +++ b/doc/manual/local.mk @@ -28,6 +28,8 @@ $(d)/manual.is-valid: $(d)/manual.xmli clean-files += $(d)/manual.xmli $(d)/version.txt $(d)/manual.is-valid +clean-files += $(d)/manual.xmli $(d)/version.txt $(d)/manual.is-valid + # Generate man pages. man-pages := $(foreach n, \ @@ -64,6 +66,8 @@ all: $(d)/manual.html clean-files += $(d)/manual.html +dist-files += $(d)/manual.html + # Generate the PDF manual. $(d)/manual.pdf: $(d)/manual.xml $(MANUAL_SRCS) $(d)/manual.is-valid @@ -77,3 +81,4 @@ $(d)/manual.pdf: $(d)/manual.xml $(MANUAL_SRCS) $(d)/manual.is-valid fi clean-files += $(d)/manual.pdf + diff --git a/local.mk b/local.mk new file mode 100644 index 0000000000..6c99ab2332 --- /dev/null +++ b/local.mk @@ -0,0 +1,3 @@ +dist-files += $(shell git ls-files) $(shell git ls-files) + +GLOBAL_CXXFLAGS = -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr diff --git a/perl/local.mk b/perl/local.mk index b5550cc9f8..74c054e713 100644 --- a/perl/local.mk +++ b/perl/local.mk @@ -15,7 +15,7 @@ $(foreach x, $(nix_perl_modules), $(eval $(call install-data-in, $(x), $(perllib ifeq ($(perlbindings), yes) $(d)/lib/Nix/Store.cc: $(d)/lib/Nix/Store.xs - xsubpp $^ -output $@ + $(trace-gen) xsubpp $^ -output $@ libraries += Store @@ -38,5 +38,3 @@ ifeq ($(perlbindings), yes) endif clean-files += $(d)/lib/Nix/Config.pm $(d)/lib/Nix/Store.cc - -dist-files += $(nix_perl_sources) diff --git a/release.nix b/release.nix index 6708719094..29bceca7c7 100644 --- a/release.nix +++ b/release.nix @@ -30,7 +30,6 @@ let configureFlags = '' --with-docbook-rng=${docbook5}/xml/rng/docbook --with-docbook-xsl=${docbook5_xsl}/xml/xsl/docbook - --with-xml-flags=--nonet --with-dbi=${perlPackages.DBI}/${perl.libPrefix} --with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix} --with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix} @@ -56,9 +55,9 @@ let ''; preDist = '' - make -C doc/manual install prefix=$out + make install prefix=$out makefiles=doc/manual/local.mk - make -C doc/manual manual.pdf prefix=$out + make doc/manual/manual.pdf cp doc/manual/manual.pdf $out/manual.pdf # The PDF containes filenames of included graphics (see diff --git a/scripts/local.mk b/scripts/local.mk index 606b73df6c..f4c5e8097d 100644 --- a/scripts/local.mk +++ b/scripts/local.mk @@ -35,5 +35,3 @@ $(foreach prog, $(nix_substituters), $(eval $(call install-program-in, $(prog), $(eval $(call install-symlink, nix-build, $(bindir)/nix-shell)) clean-files += $(nix_bin_scripts) $(nix_noinst_scripts) - -dist-files += $(d)/*.in diff --git a/src/bsdiff-4.3/local.mk b/src/bsdiff-4.3/local.mk index 320795a94c..c957ceab0c 100644 --- a/src/bsdiff-4.3/local.mk +++ b/src/bsdiff-4.3/local.mk @@ -9,5 +9,3 @@ bspatch_DIR := $(d) bspatch_SOURCES := $(d)/bspatch.c bspatch_LDFLAGS = -lbz2 $(bsddiff_compat_include) bspatch_INSTALL_DIR = $(libexecdir)/nix - -dist-files += $(d)/compat-include/* diff --git a/src/libexpr/local.mk b/src/libexpr/local.mk index ff35155b1a..85e476e39b 100644 --- a/src/libexpr/local.mk +++ b/src/libexpr/local.mk @@ -14,7 +14,9 @@ libexpr_LIBS = libutil libstore libformat libexpr_LDFLAGS_PROPAGATED = $(BDW_GC_LIBS) $(d)/parser-tab.cc $(d)/parser-tab.hh: $(d)/parser.y - bison -v -o $(libexpr_DIR)/parser-tab.cc $< -d + $(trace-gen) bison -v -o $(libexpr_DIR)/parser-tab.cc $< -d $(d)/lexer-tab.cc $(d)/lexer-tab.hh: $(d)/lexer.l - flex --outfile $(libexpr_DIR)/lexer-tab.cc --header-file=$(libexpr_DIR)/lexer-tab.hh $< + $(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 diff --git a/src/libstore/local.mk b/src/libstore/local.mk index a9ae532700..2dddce740d 100644 --- a/src/libstore/local.mk +++ b/src/libstore/local.mk @@ -23,4 +23,6 @@ libstore_CXXFLAGS = \ $(d)/local-store.cc: $(d)/schema.sql.hh %.sql.hh: %.sql - sed -e 's/"/\\"/g' -e 's/\(.*\)/"\1\\n"/' < $< > $@ || (rm $@ && exit 1) + $(trace-gen) sed -e 's/"/\\"/g' -e 's/\(.*\)/"\1\\n"/' < $< > $@ || (rm $@ && exit 1) + +clean-files += $(d)/schema.sql.hh From 844d83352c23db4a3131ac2b11b9ed2af03cdfd6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 1 Feb 2014 15:18:48 +0100 Subject: [PATCH 84/89] More "make dist" fixes --- doc/manual/local.mk | 4 +++- local.mk | 4 +++- release.nix | 7 ++++--- src/libexpr/local.mk | 2 ++ 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/doc/manual/local.mk b/doc/manual/local.mk index 92413eb7e2..081b985570 100644 --- a/doc/manual/local.mk +++ b/doc/manual/local.mk @@ -28,7 +28,7 @@ $(d)/manual.is-valid: $(d)/manual.xmli clean-files += $(d)/manual.xmli $(d)/version.txt $(d)/manual.is-valid -clean-files += $(d)/manual.xmli $(d)/version.txt $(d)/manual.is-valid +dist-files += $(d)/manual.xmli $(d)/version.txt $(d)/manual.is-valid # Generate man pages. @@ -47,6 +47,8 @@ $(man-pages): $(d)/manual.xmli $(d)/manual.is-valid clean-files += $(d)/*.1 $(d)/*.5 $(d)/*.8 +dist-files += $(d)/*.1 $(d)/*.5 $(d)/*.8 + # Generate the HTML manual. $(d)/manual.html: $(d)/manual.xml $(MANUAL_SRCS) $(d)/manual.is-valid diff --git a/local.mk b/local.mk index 6c99ab2332..174e6150e0 100644 --- a/local.mk +++ b/local.mk @@ -1,3 +1,5 @@ dist-files += $(shell git ls-files) $(shell git ls-files) -GLOBAL_CXXFLAGS = -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr +dist-files += configure config.h.in + +GLOBAL_CXXFLAGS += -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr diff --git a/release.nix b/release.nix index 29bceca7c7..8d395189e2 100644 --- a/release.nix +++ b/release.nix @@ -48,14 +48,13 @@ let distPhase = '' runHook preDist - make dist-gzip - make dist-xz + make dist mkdir -p $out/tarballs cp *.tar.* $out/tarballs ''; preDist = '' - make install prefix=$out makefiles=doc/manual/local.mk + make install docdir=$out/share/doc/nix makefiles=doc/manual/local.mk make doc/manual/manual.pdf cp doc/manual/manual.pdf $out/manual.pdf @@ -98,6 +97,8 @@ let makeFlags = "profiledir=$(out)/etc/profile.d"; + preBuild = "unset NIX_INDENT_MAKE"; + installFlags = "sysconfdir=$(out)/etc"; doInstallCheck = true; diff --git a/src/libexpr/local.mk b/src/libexpr/local.mk index 85e476e39b..431f84b099 100644 --- a/src/libexpr/local.mk +++ b/src/libexpr/local.mk @@ -20,3 +20,5 @@ $(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 From 28dc4883356a50f2805a3e3c819a541c44a4ff0a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 1 Feb 2014 15:33:27 +0100 Subject: [PATCH 85/89] installcheck: Don't depend on install This is a hack to prevent "installcheck" from clobbering files fixed up by Nixpkgs' fixupPhase. --- tests.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests.mk b/tests.mk index 339abd5803..bb94a83ac3 100644 --- a/tests.mk +++ b/tests.mk @@ -10,7 +10,7 @@ define run-install-test = endef -installcheck: install +installcheck: @total=0; failed=0; for i in $(_installcheck-list); do \ total=$$((total + 1)); \ echo "running test $$i"; \ From 762ef464f843a0fe50e25ba07d11296b1540080e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 1 Feb 2014 15:37:50 +0100 Subject: [PATCH 86/89] Fix the nix-profile test --- release.nix | 1 + tests/common.sh.in | 1 - tests/nix-profile.sh | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/release.nix b/release.nix index 8d395189e2..c1618d176a 100644 --- a/release.nix +++ b/release.nix @@ -102,6 +102,7 @@ let installFlags = "sysconfdir=$(out)/etc"; doInstallCheck = true; + installCheckFlags = "sysconfdir=$(out)/etc"; }); diff --git a/tests/common.sh.in b/tests/common.sh.in index 633769ae2c..2bbc39c28a 100644 --- a/tests/common.sh.in +++ b/tests/common.sh.in @@ -1,7 +1,6 @@ set -e datadir="@datadir@" -profiledir="@sysconfdir@/profile.d" export TEST_ROOT=$(pwd)/test-tmp export NIX_STORE_DIR diff --git a/tests/nix-profile.sh b/tests/nix-profile.sh index a00864c977..3586a7efc3 100644 --- a/tests/nix-profile.sh +++ b/tests/nix-profile.sh @@ -3,8 +3,8 @@ source common.sh home=$TEST_ROOT/home rm -rf $home mkdir -p $home -HOME=$home $SHELL -e -c ". $profiledir/nix.sh" -HOME=$home $SHELL -e -c ". $profiledir/nix.sh" # test idempotency +HOME=$home $SHELL -e -c ". ../scripts/nix-profile.sh" +HOME=$home $SHELL -e -c ". ../scripts/nix-profile.sh" # test idempotency [ -L $home/.nix-profile ] [ -e $home/.nix-channels ] From 965218a62a195632fe754307e09d4d4abd286c82 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 1 Feb 2014 16:08:51 +0100 Subject: [PATCH 87/89] Remove obsolete file --- substitute.mk | 43 ------------------------------------------- 1 file changed, 43 deletions(-) delete mode 100644 substitute.mk diff --git a/substitute.mk b/substitute.mk deleted file mode 100644 index d90bded78a..0000000000 --- a/substitute.mk +++ /dev/null @@ -1,43 +0,0 @@ -%: %.in Makefile - sed \ - -e "s^@abs_top_srcdir\@^$(abs_top_srcdir)^g" \ - -e "s^@abs_top_builddir\@^$(abs_top_builddir)^g" \ - -e "s^@extra1\@^$(extra1)^g" \ - -e "s^@prefix\@^$(prefix)^g" \ - -e "s^@bindir\@^$(bindir)^g" \ - -e "s^@datadir\@^$(datadir)^g" \ - -e "s^@sysconfdir\@^$(sysconfdir)^g" \ - -e "s^@profiledir\@^$(profiledir)^g" \ - -e "s^@localstatedir\@^$(localstatedir)^g" \ - -e "s^@datadir\@^$(datadir)^g" \ - -e "s^@libdir\@^$(libdir)^g" \ - -e "s^@libexecdir\@^$(libexecdir)^g" \ - -e "s^@storedir\@^$(storedir)^g" \ - -e "s^@system\@^$(system)^g" \ - -e "s^@shell\@^$(bash)^g" \ - -e "s^@curl\@^$(curl)^g" \ - -e "s^@bzip2\@^$(bzip2)^g" \ - -e "s^@xz\@^$(xz)^g" \ - -e "s^@perl\@^$(perl)^g" \ - -e "s^@perlFlags\@^$(perlFlags)^g" \ - -e "s^@coreutils\@^$(coreutils)^g" \ - -e "s^@sed\@^$(sed)^g" \ - -e "s^@tar\@^$(tar)^g" \ - -e "s^@tarFlags\@^$(tarFlags)^g" \ - -e "s^@gzip\@^$(gzip)^g" \ - -e "s^@pv\@^$(pv)^g" \ - -e "s^@tr\@^$(tr)^g" \ - -e "s^@dot\@^$(dot)^g" \ - -e "s^@xmllint\@^$(xmllint)^g" \ - -e "s^@xmlflags\@^$(xmlflags)^g" \ - -e "s^@xsltproc\@^$(xsltproc)^g" \ - -e "s^@sqlite_bin\@^$(sqlite_bin)^g" \ - -e "s^@version\@^$(VERSION)^g" \ - -e "s^@perlbindings\@^$(perlbindings)^g" \ - -e "s^@testPath\@^$(coreutils):$$(dirname $$(type -p expr))^g" \ - -e "s^@openssl\@^$(openssl_prog)^g" \ - < $< > $@ || rm $@ - if test -x $<; then chmod +x $@; fi - -$(CONFIG_HEADER): - true From 2a97f7b039be4cd290076707e1b02d04d3b257b6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 1 Feb 2014 16:08:59 +0100 Subject: [PATCH 88/89] Fix logging test --- tests/common.sh.in | 1 - tests/logging.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/common.sh.in b/tests/common.sh.in index 2bbc39c28a..0c4df71192 100644 --- a/tests/common.sh.in +++ b/tests/common.sh.in @@ -23,7 +23,6 @@ export PATH=@bindir@:$PATH export NIX_BUILD_HOOK= export dot=@dot@ export xmllint="@xmllint@" -export xmlflags="@xmlflags@" export xsltproc="@xsltproc@" export SHELL="@bash@" diff --git a/tests/logging.sh b/tests/logging.sh index 117d483716..764999327c 100644 --- a/tests/logging.sh +++ b/tests/logging.sh @@ -11,7 +11,7 @@ nix-log2xml < $TEST_ROOT/log.esc > $TEST_ROOT/log.xml # Is this well-formed XML? if test "$xmllint" != "false"; then - $xmllint $xmlflags --noout $TEST_ROOT/log.xml || fail "malformed XML" + $xmllint --noout $TEST_ROOT/log.xml || fail "malformed XML" fi # Convert to HTML. From 6dca72006aa9b1cf2f226bb5b538e744fcab976f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 1 Feb 2014 16:30:24 +0100 Subject: [PATCH 89/89] Only run "git ls-files" when doing "make check" --- doc/manual/local.mk | 2 +- local.mk | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/manual/local.mk b/doc/manual/local.mk index 081b985570..4342215b0e 100644 --- a/doc/manual/local.mk +++ b/doc/manual/local.mk @@ -47,7 +47,7 @@ $(man-pages): $(d)/manual.xmli $(d)/manual.is-valid clean-files += $(d)/*.1 $(d)/*.5 $(d)/*.8 -dist-files += $(d)/*.1 $(d)/*.5 $(d)/*.8 +dist-files += $(man-pages) # Generate the HTML manual. diff --git a/local.mk b/local.mk index 174e6150e0..c48857f24b 100644 --- a/local.mk +++ b/local.mk @@ -1,4 +1,6 @@ -dist-files += $(shell git ls-files) $(shell git ls-files) +ifeq ($(MAKECMDGOALS), dist) + dist-files += $(shell git ls-files) $(shell git ls-files) +endif dist-files += configure config.h.in