build: Resurrect non-bootstrap build.
* 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.
This commit is contained in:
parent
c086f67cec
commit
b6b93f9f19
|
@ -23,8 +23,10 @@ if [ -n "$BUILD_DEBUG" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
export GUILE
|
export GUILE
|
||||||
|
export GUILE_AUTO_COMPILE
|
||||||
GUILE=${GUILE-$(command -v guile)}
|
GUILE=${GUILE-$(command -v guile)}
|
||||||
GUILE_TOOLS=${GUILE_TOOLS-$(command -v guile-tools)}
|
GUILE_TOOLS=${GUILE_TOOLS-$(command -v guile-tools)}
|
||||||
|
GUILE_AUTO_COMPILE=0
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
|
|
2
configure
vendored
2
configure
vendored
|
@ -191,7 +191,7 @@ exec ${GUILE-guile} -L . --no-auto-compile -e '(configure)' -s "$0" ${1+"$@"}
|
||||||
(with-courage)
|
(with-courage)
|
||||||
;;ignore
|
;;ignore
|
||||||
(enable-fast-install))))
|
(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)))
|
(define* (print-help #:optional (port (current-output-port)))
|
||||||
(format port "\
|
(format port "\
|
||||||
|
|
4
guix.scm
4
guix.scm
|
@ -159,9 +159,7 @@ hex2 linker.")
|
||||||
'())
|
'())
|
||||||
("perl" ,perl))) ;build-aux/gitlog-to-changelog
|
("perl" ,perl))) ;build-aux/gitlog-to-changelog
|
||||||
(arguments
|
(arguments
|
||||||
`(#:make-flags (list
|
`(#:phases
|
||||||
(string-append "PREFIX=" (assoc-ref %outputs "out")))
|
|
||||||
#:phases
|
|
||||||
(modify-phases %standard-phases
|
(modify-phases %standard-phases
|
||||||
(add-before 'build 'make-git-source-writable
|
(add-before 'build 'make-git-source-writable
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
|
|
|
@ -52,7 +52,7 @@ sed \
|
||||||
-e "s,@VERSION@,$VERSION,g" \
|
-e "s,@VERSION@,$VERSION,g" \
|
||||||
module/mes/boot-0.scm > $MODULEDIR/mes/boot-0.scm
|
module/mes/boot-0.scm > $MODULEDIR/mes/boot-0.scm
|
||||||
|
|
||||||
cp scripts/diff.scm $PREFIX/bin/diff.scm
|
|
||||||
sed \
|
sed \
|
||||||
-e "s,^#! /bin/sh,#! $SHELL," \
|
-e "s,^#! /bin/sh,#! $SHELL," \
|
||||||
scripts/diff.scm > $PREFIX/bin/diff.scm
|
scripts/diff.scm > $PREFIX/bin/diff.scm
|
||||||
|
chmod -w+x $PREFIX/bin/diff.scm
|
||||||
|
|
Loading…
Reference in a new issue