From d5d16686306c9a3b8cfc5c35d79ed2117a15c1e0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 27 Nov 2014 23:51:48 +0100 Subject: Add (guix elf). * guix/elf.scm: New file. Taken from Guile 'master', commit 3f826e3. * Makefile.am (MODULES): Add it. * THANKS: Thank Andy, who wrote this module. --- Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index ee029c3735..25ff2224cc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -56,6 +56,7 @@ MODULES = \ guix/ftp-client.scm \ guix/http-client.scm \ guix/gnupg.scm \ + guix/elf.scm \ guix/store.scm \ guix/svn-download.scm \ guix/ui.scm \ -- cgit v1.2.3 From 6005bd0700544df27331c6aad9c7642dce9a91c8 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 9 Dec 2014 11:44:21 +0100 Subject: build: Make sure the installed 'config.go' is newer than 'config.scm'. Fixes . Reported by rekado . * gnu-system.am (install-data-hook): Rename to... (set-bootstrap-executable-permissions): ... this. * Makefile.am (install-data-hook): New target. --- Makefile.am | 7 +++++++ gnu-system.am | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 25ff2224cc..bc0b95232e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -282,6 +282,13 @@ SUFFIXES = .go guix_install_go_files = install-nobase_nodist_guilemoduleDATA $(guix_install_go_files): install-nobase_dist_guilemoduleDATA +# The above trick doesn't work for 'config.go' because both 'config.scm' and +# 'config.go' are listed in $(nobase_nodist_guilemodule_DATA). Thus, give it +# special treatment. +install-data-hook: set-bootstrap-executable-permissions + touch "$(DESTDIR)$(guilemoduledir)/guix/config.go" + + SUBDIRS = po/guix po/packages BUILT_SOURCES = diff --git a/gnu-system.am b/gnu-system.am index e21771c669..ab62510159 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -484,7 +484,7 @@ nodist_bootstrap_mips64el_linux_DATA = \ # Those files must remain executable, so they remain executable once # imported into the store. -install-data-hook: +set-bootstrap-executable-permissions: chmod +x $(DESTDIR)$(bootstrapdir)/*/{bash,mkdir,tar,xz} DISTCLEANFILES = \ -- cgit v1.2.3