summaryrefslogtreecommitdiff
path: root/guix/build/gnu-build-system.scm
AgeCommit message (Expand)Author
2014-02-22build-system/gnu: Allow the source to be a directory....* guix/build/gnu-build-system.scm (unpack): Check if SOURCE is a directory, and copy it locally if it is. * gnu/packages/libwebsockets.scm (libwebsockets)[arguments]: Remove 'unpack' phase. Ludovic Courtès
2014-02-10build-system/gnu: Set the docdir to "share/doc"...* guix/build/gnu-build-system.scm (configure): Change docdir directory from "doc" to "share/doc". Signed-off-by: Ludovic Courtès <ludo@gnu.org> John Darrington
2014-01-28Revert "build-system/gnu: Pass --localstatedir=/var --sharedstatedir=/com."...This reverts commit 65529e49ff5b9052544271b1b7923feed4312849. Ludovic Courtès
2014-01-27build-system/gnu: Pass --localstatedir=/var --sharedstatedir=/com....Suggested by John Darrington <john@darrington.wattle.id.au> and Mark H Weaver <mhw@netris.org>. * guix/build/gnu-build-system.scm (configure): Pass --localstatedir=/var --sharedstatedir=/com. * gnu/packages/admin.scm (dmd): Remove 'arguments' field. * gnu/packages/avahi.scm (avahi): Remove --localstatedir flag. * gnu/packages/glib.scm (dbus): Likewise. * gnu/packages/package-management.scm (guix): Likewise. * gnu/packages/pulseaudio.scm (pulseaudio): Likewise. Ludovic Courtès
2013-12-17gnu: gnu-build-system: Add CC_FOR_BUILD to configure flags....* guix/build/gnu-build-system.scm: Add new configure flag: CC_FOR_BUILD=gcc * gnu/packages/gnupg.scm, gnu/packages/guile.scm, gnu/packages/make-bootstrap.scm: remove CC_FOR_BUILD from these package descriptions. Signed-off-by: Ludovic Courtès <ludo@gnu.org> John Darrington
2013-10-10build-system/{gnu,cmake}: Remove #:patches and #:patch-flags parameters....* guix/build/gnu-build-system.scm (patch): Remove. (%standard-phases): Remove 'patch'. * guix/build-system/gnu.scm (gnu-build, gnu-cross-build): Remove #:patches and #:patch-flags parameters. * guix/build-system/cmake.scm (cmake-build): Likewise. * guix/build-system/python.scm (package-with-explicit-python): Update comment. Ludovic Courtès
2013-07-03build-system/gnu: Write debug files to the "debug" sub-derivation, if any....* guix/build/gnu-build-system.scm (strip): Add `objcopy-command' keyword parameter. [debug-output, debug-file-extension]: New variables. [debug-file, make-debug-file, add-debug-link]: New procedures. [strip-dir]: Use them. Ludovic Courtès
2013-06-22build-system/gnu: Set #:tests? to #f when cross-compiling....* guix/build/gnu-build-system.scm (check): Add `target' formal parameter. Change `tests?' to default to (not target). Ludovic Courtès
2013-06-21build-system/gnu: Save `environment-variables' after each phase....* guix/build/gnu-build-system.scm (set-paths): Move `system' call to... (gnu-build): ... here. Ludovic Courtès
2013-06-21build-system/gnu: Unify with (guix build-system gnu-cross-build)....* guix/build/gnu-build-system.scm (set-paths): Add `native-inputs' and `native-search-paths' keyword parameters. Honor them. (configure): Add `target' and `native-inputs' keyword parameters. Look for Bash in NATIVE-INPUTS or INPUTS. Pass `--host' when TARGET is true. (strip): Add `strip-command' keyword parameter. Use it. * guix/build/gnu-cross-build.scm: Remove. * Makefile.am (MODULES): Adjust accordingly. * gnu/packages/acl.scm, gnu/packages/attr.scm, gnu/packages/base.scm, gnu/packages/bash.scm, gnu/packages/gawk.scm, gnu/packages/gettext.scm, gnu/packages/guile.scm, gnu/packages/libffi.scm, gnu/packages/libsigsegv.scm, gnu/packages/linux.scm, gnu/packages/ncurses.scm, gnu/packages/readline.scm, guix/build-system/gnu.scm: Replace `%standard-cross-phases' by `%standard-phases'. Remove references to (guix build gnu-cross-build). Ludovic Courtès
2013-04-28build-system/gnu: Fix default name for the "doc" output directory....* guix/build/gnu-build-system.scm (configure)[package-name]: Drop the prefix corresponding to the hash part of OUT. Ludovic Courtès
2013-03-30packages: Add `native-search-paths' field and honor it....* guix/packages.scm (<search-path-specification>): New record type. (search-path-specification->sexp): New procedure. (<package>)[native-search-paths]: New field. (package-derivation): Accumulate the search paths, and pass them as #:search-paths toe BUILDER. * guix/build-system/gnu.scm (gnu-build): Add #:search-paths. Compute `implicit-search-paths'. Pass #:search-paths in BUILDER. * guix/build-system/perl.scm (perl-build): Add #:search-paths, pass it to BUILDER with the search paths of PERL. * guix/build-system/cmake.scm (cmake-build): Add #:search-paths, pass it to BUILDER. * guix/build-system/trivial.scm (trivial-build): Add #:search-paths, ignore it. * guix/build/gnu-build-system.scm (set-paths): Add #:search-paths. Remove explicit settings of CPATH, LIBRARY_PATH, and PKG_CONFIG_PATH. Instead, walk SEARCH-PATHS and call `set-path-environment-variable' for them. * guix/build/perl-build-system.scm (perl-build): Remove PERL5LIB setting. * tests/packages.scm ("search paths"): New test. * gnu/packages/bootstrap.scm (%bootstrap-guile)[raw]: Add #:search-paths. (%bootstrap-gcc): Add `native-search-paths' field. * gnu/packages/perl.scm (perl): Likewise. * gnu/packages/pkg-config.scm (pkg-config): Likewise. * gnu/packages/glib.scm (intltool): Remove `arguments'. * gnu/packages/avahi.scm (avahi): Remove #:phases. Ludovic Courtès
2013-03-30build-system/gnu: Remove #:path-exclusions parameter....* guix/build/gnu-build-system.scm (set-paths): Remove `path-exclusions' parameter. Replace `relevant-input-directories' by `input-directories'. * guix/build-system/gnu.scm (gnu-build): Remove `path-exclusions' parameter; don't pass it in BUILDER. * guix/build-system/cmake.scm (cmake-build): Likewise. Ludovic Courtès
2013-03-04guix: build: Add "share/pkgconfig" to PKG_CONFIG_PATH, as used by xorg....* guix/build/gnu-build-system.scm (set-paths): Add "share/pkgconfig" to PKG_CONFIG_PATH. Andreas Enge
2013-01-10build-system/gnu: Improve support for "lib" outputs; support "doc" outputs....* guix/build/gnu-build-system.scm (configure)[package-name]: New procedure. When LIBDIR is true and INCLUDEDIR is false, add --includedir=LIBDIR/include. Add support for --docdir when a "doc" output exists. Ludovic Courtès
2013-01-05Update license headers of builder-side code....Change license headers with this script: (use-modules (guix build utils)) (fluid-set! %default-port-encoding "UTF-8") (substitute* (cons "distro/packages/ld-wrapper.scm" (find-files "guix/build" "\\.scm$")) (("^([[:graph:]]+) This file is part of Guix." _ comment-start) (string-append comment-start " This file is part of GNU Guix.")) (("^([[:graph:]]+) Guix --- Nix package management.*" _ comment-start) (string-append comment-start " GNU Guix --- Functional package management for GNU\n")) (("^([[:graph:]]+) Guix is " _ comment-start) (string-append comment-start " GNU Guix is ")) (("^([[:graph:]]+) along with Guix." _ comment-start) (string-append comment-start " along with GNU Guix.")) (("^([[:graph:]]+) Copyright \\(C\\)" _ comment-start) (string-append comment-start " Copyright ©"))) * distro/packages/ld-wrapper.scm, guix/build/download.scm, guix/build/gnu-build-system.scm, guix/build/union.scm, guix/build/utils.scm: Update license headers. Ludovic Courtès
2013-01-01build-system/gnu: Add support for the "bin" output....* guix/build/gnu-build-system.scm (configure): Add support for "bin" output. Ludovic Courtès
2012-12-21build-system/gnu: Patch shebangs in all the source; patch SHELL in makefiles....* guix/build/utils.scm (call-with-ascii-input-file): New procedure. (patch-shebang): Use it. (patch-makefile-SHELL): New procedure. * guix/build/gnu-build-system.scm (patch-source-shebangs): Patch all the files, not just executables; remove `po/Makefile.in.in' patching. (patch-generated-files): Rename to... (patch-generated-file-shebangs): ... this. Patch executables and makefiles. (%standard-phases): Adjust accordingly. * distro/packages/autotools.scm (libtool): Remove call to `patch-shebang'. * distro/packages/base.scm (gcc-4.7): Likewise. (guile-final): Remove hack to skip `test-command-line-encoding2'. * distro/packages/bash.scm (bash): Remove `pre-configure-phase'. * distro/packages/readline.scm (readline): Likewise. * distro/packages/ncurses.scm (ncurses): Remove `pre-install-phase'. Ludovic Courtès
2012-12-20build-system/gnu: Patch shebangs after `configure'....* guix/build/gnu-build-system.scm (patch-generated-files): New procedure. (%standard-phases): Add it after `configure'. Ludovic Courtès
2012-12-20build-system/gnu: Report the execution time of each phase....* guix/build/gnu-build-system.scm (gnu-build): Report the success or failure of each phase and its execution time. Ludovic Courtès
2012-12-19build-system/gnu: Change the order of `patch-source-shebangs' and `patch'....* guix/build/gnu-build-system.scm (patch-source-shebangs): Add a newline after the "SHELL =" line in po/Makefile.in.in. (%standard-phases): Move `patch-source-shebangs' after `patch'. Ludovic Courtès
2012-12-15build-system/gnu: Patch shebangs in executable source files....This allows many packages to build in a chroot that lacks /bin and thus /bin/sh. * guix/build/gnu-build-system.scm (patch-source-shebangs): New procedure. (%standard-phases): Add it. * guix/build/utils.scm (executable-file?): New procedure. * distro/packages/perl.scm (perl): Don't use /bin/sh to run `Configure'. Ludovic Courtès
2012-12-15build-system/gnu: Make the error port line-buffered....* guix/build/gnu-build-system.scm (gnu-build): Make the error port line-buffered. Ludovic Courtès
2012-12-13build-system/gnu: Avoid using /bin/sh....* guix/build/gnu-build-system.scm (configure): Add `inputs' keyword parameter. Take Bash from there, falling back to /bin/sh. Set `CONFIG_SHELL' and `SHELL' to that Bash. Run "bash ./configure" instead of just "./configure". * distro/packages/bootstrap.scm (%bootstrap-inputs): Add "bash". * distro/packages/base.scm (gcc-boot0-wrapped): Use "bash" from %BOOT1-INPUTS instead of /bin/sh. Ludovic Courtès
2012-10-05Support build-cores = 0; change `guix-build' to default to 0....* guix/build/gnu-build-system.scm (%parallel-job-count): New variable. (build, check): Use it instead of $NIX_BUILD_CORES. * guix-build.in (guix-build): Default to 0 for the #:build-cores option. Ludovic Courtès
2012-09-06build-system/gnu: Fix `#:path-exclusions' handling....* guix/build/gnu-build-system.scm (set-paths)[relevant-input-directories]: New procedure. Use it. This fixes #:path-exclusions handling. Ludovic Courtès
2012-09-01build-system/gnu: Really apply patches....* guix/build/gnu-build-system.scm (patch): Use `--input FILE', not just `FILE'. Ludovic Courtès
2012-09-01build-system/gnu: Add `path-exclusions' parameter....* guix/build/gnu-build-system.scm (set-paths): Add new `path-exclusions' parameter; honor it. * guix/build-system/gnu.scm (gnu-build): New `path-exclusions' keyword parameter; pass it to BUILDER. * distro/base.scm (gcc-4.7): Exclude "libc" from $LIBRARY_PATH. Ludovic Courtès
2012-08-31build-system/gnu: Honor the `patch-shebangs?' and `strip-binaries?' parameters....* guix/build/gnu-build-system.scm (patch-shebangs): Honor PATCH-SHEBANGS?. (strip): Honor STRIP-BINARIES?. Display a message from `strip-dir'. Ludovic Courtès
2012-08-31build-system/gnu: Add a `strip' phase....* guix/build/gnu-build-system.scm (strip): New procedure. (%standard-phases): Add it. * guix/build-system/gnu.scm (gnu-build): New `strip-binaries?', `strip-flags', and `strip-directories' keyword parameters. Pass them to BUILDER. Ludovic Courtès
2012-08-30build-system/gnu: Always invoke `configure' with a relative path....* guix/build/gnu-build-system.scm (configure): Change SRCDIR to always be a relative path. Ludovic Courtès
2012-08-23build-system/gnu: Add `out-of-source?' keyword parameter....* guix/build/gnu-build-system.scm (configure): Add an `out-of-source?' keyword parameter; build out-of-source-tree when #t. * guix/build-system/gnu.scm (gnu-build): Add `out-of-source?' keyword parameter. Pass it in BUILDER. Ludovic Courtès
2012-08-19build-system/gnu: Augment $PATH with $out for `patch-shebangs'....* guix/build/gnu-build-system.scm (patch-shebangs): Add BINDIRS to $PATH, and pass that to `patch-shebang'. Ludovic Courtès
2012-08-19build-system/gnu: Add a `patch-shebangs' phase....* guix/build/gnu-build-system.scm (patch-shebangs): New procedure. (%standard-phases): Add it. * guix/build-system/gnu.scm (gnu-build): New `patch-shebangs?' keyword parameter. Pass it to the builder's `gnu-build'. Ludovic Courtès
2012-07-07build-system/gnu: Set $PKG_CONFIG_PATH....* guix/build/gnu-build-system.scm (set-paths): Add `PKG_CONFIG_PATH'. Ludovic Courtès
2012-07-07build-system/gnu: Support parallel builds and tests....* guix/build/gnu-build-system.scm (build): Add `parallel-build?' parameter; honor it and $NIX_BUILD_CORES. (check): Add `parallel-tests?' parameter; likewise. * guix/build-system/gnu.scm (gnu-build): Add `parallel-build?' and `parallel-tests?' parameters. [builder]: Inherit them. Ludovic Courtès
2012-07-06gnu-build-system: Dump the values of environment variables....* guix/build/gnu-build-system.scm (set-paths): Dump the value of environment variables in the `environment-variables' files, similar to what Nixpkgs does. Ludovic Courtès
2012-07-05build-system/gnu: Add a `patch' phase....* guix/build/gnu-build-system.scm (patch): New procedure. (%standard-phases): Add `patch'. * guix/build-system/gnu.scm (gnu-build): Add `patches' and `patch-flags' parameters. Pass them on. Ludovic Courtès
2012-07-02gnu-build-system: Improve the `configure' and `check' phases....* guix/build/gnu-build-system.scm (configure): Print the final list of flags. (check): Add `tests?' keyword parameter. Ludovic Courtès
2012-07-02gnu-build-system: Print the `configure' flags....* guix/build/gnu-build-system.scm (configure): Print CONFIGURE-FLAGS. Ludovic Courtès
2012-07-02gnu-build-system: Fix "libdir" and "includedir" for multiple-output drvs....* guix/build/gnu-build-system.scm (configure): Change `--libdir' and `--includedir' to LIBDIR + "/lib" and INCLUDEDIR + "/include", respectively. Ludovic Courtès
2012-06-16gnu-build-system: Structure as a customizable sequence of phases....* guix/build/gnu-build-system.scm (set-paths, build, check, install): New procedures. (unpack): Make `source' a keyword arg; add `#:allow-other-keys'. (configure): Likewise. (%standard-phases): New variable. (gnu-build): Make `source', `outputs', and `inputs' keyword arguments; add `phases' keyword argument; #:allow-other-keys; add rest arguments `args'. Invoke each of PHASES in order within `every'. * guix/gnu-build-system.scm (gnu-build): Add `make-flags' and `phases' keyword arguments. Update builder's `gnu-build' call to match the new convention. Ludovic Courtès
2012-06-13Add supporting tools for the GNU Build System....* guix/derivations.scm (build-expression->derivation): Add all of INPUTS as inputs to the final derivation. * guix/build/gnu-build-system.scm, guix/build/utils.scm, guix/gnu-build-system.scm: New files. * tests/builders.scm ("gnu-build"): New test. Ludovic Courtès