build: Resurrect non-bootstrap build.
authorJan Nieuwenhuizen <janneke@gnu.org>
Tue, 12 Jun 2018 05:05:33 +0000 (07:05 +0200)
committerJan Nieuwenhuizen <janneke@gnu.org>
Tue, 12 Jun 2018 05:05:33 +0000 (07:05 +0200)
* configure (parse-opts): Support mixing VAR=VALUE --prefix=PREFIX.
* guix.scm (mes): Remove setting PREFIX in make-flags.
* install.sh: Cater for Guix's setting read-only of scripts/diff.scm.

build-aux/build-guile.sh
configure
guix.scm
install.sh

index 75e826ccea3d7b04856b912db46de3c49784fc04..f04c209729ca13c79bd53cc55b25b08eafee0339 100755 (executable)
@@ -23,8 +23,10 @@ if [ -n "$BUILD_DEBUG" ]; then
 fi
 
 export GUILE
+export GUILE_AUTO_COMPILE
 GUILE=${GUILE-$(command -v guile)}
 GUILE_TOOLS=${GUILE_TOOLS-$(command -v guile-tools)}
+GUILE_AUTO_COMPILE=0
 
 set -e
 
index 81b18a6313b758500b186e0d8a29d9aeff7723ea..aa4ea5134fc291be0d60ff25a8dfbb8d3950758b 100755 (executable)
--- a/configure
+++ b/configure
@@ -191,7 +191,7 @@ exec ${GUILE-guile} -L . --no-auto-compile -e '(configure)' -s "$0" ${1+"$@"}
             (with-courage)
             ;;ignore
             (enable-fast-install))))
-    (getopt-long args option-spec #:stop-at-first-non-option #t)))
+    (getopt-long args option-spec)))
 
 (define* (print-help #:optional (port (current-output-port)))
   (format port "\
index 3e61b7ddcea28a96ec0bbe38c81d1606469893a7..0d45dd2b1f5d0f2f3909bc824637ca463a48e067 100644 (file)
--- a/guix.scm
+++ b/guix.scm
@@ -159,9 +159,7 @@ hex2 linker.")
                '())
          ("perl" ,perl)))               ;build-aux/gitlog-to-changelog
       (arguments
-       `(#:make-flags (list
-                       (string-append "PREFIX=" (assoc-ref %outputs "out")))
-         #:phases
+       `(#:phases
          (modify-phases %standard-phases
            (add-before 'build 'make-git-source-writable
            (lambda* (#:key outputs #:allow-other-keys)
index 6304adb5d74475fef9357b2700aa3ebe41168227..112807bceb6283e07f9987d533411c19035100e3 100755 (executable)
@@ -52,7 +52,7 @@ sed \
     -e "s,@VERSION@,$VERSION,g" \
     module/mes/boot-0.scm > $MODULEDIR/mes/boot-0.scm
 
-cp scripts/diff.scm $PREFIX/bin/diff.scm
 sed \
     -e "s,^#! /bin/sh,#! $SHELL," \
     scripts/diff.scm > $PREFIX/bin/diff.scm
+chmod -w+x $PREFIX/bin/diff.scm