ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: Add `--with-libgcrypt-prefix'; capture the path to libgcrypt.

Browse source 
* configure.ac: Add `--with-libgcrypt-prefix'.  Substitute `LIBGCRYPT'.

* Makefile.am (.scm.go): Pass $(LIBGCRYPT).

* guix/utils.scm (%libgcrypt): New variable.
  (sha256): Use it.
This commit is contained in:
Ludovic Courtès 2012-08-17 10:41:27 +02:00
parent 93a0a8b3fd
commit 3a310cc017
3 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile.am
View file

@ -75,6 +75,7 @@ CLEANFILES = $(GOBJECTS) *.log
$(MKDIR_P) `dirname "$@"` $(MKDIR_P) `dirname "$@"`
NIX_INSTANTIATE="$(NIX_INSTANTIATE)" \ NIX_INSTANTIATE="$(NIX_INSTANTIATE)" \
NIXPKGS="$(NIXPKGS)" \ NIXPKGS="$(NIXPKGS)" \
LIBGCRYPT="$(LIBGCRYPT)" \
GUILE_AUTO_COMPILE=0 \ GUILE_AUTO_COMPILE=0 \
GUILE_LOAD_COMPILED_PATH="$(top_builddir):$$GUILE_LOAD_COMPILED_PATH" \ GUILE_LOAD_COMPILED_PATH="$(top_builddir):$$GUILE_LOAD_COMPILED_PATH" \
$(GUILD) compile -L "$(top_srcdir)" \ $(GUILD) compile -L "$(top_srcdir)" \

17
configure.ac
View file

@ -58,6 +58,23 @@ else
AC_MSG_WARN([Please use `--with-nixpkgs'.]) AC_MSG_WARN([Please use `--with-nixpkgs'.])
fi fi
AC_ARG_WITH([libgcrypt-prefix],
[AS_HELP_STRING([--with-libgcrypt-prefix=DIR], [search for GNU libgcrypt in DIR])],
[case "$withval" in
yes|no)
LIBGCRYPT="libgcrypt"
;;
*)
LIBGCRYPT="$withval/lib/libgcrypt"
;;
esac],
[LIBGCRYPT="libgcrypt"])
dnl Library name suitable for `dynamic-link'.
AC_MSG_CHECKING([for libgcrypt shared library name])
AC_MSG_RESULT([$LIBGCRYPT])
AC_SUBST([LIBGCRYPT])
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile
po/Makefile.in po/Makefile.in
guix-build]) guix-build])

8
guix/utils.scm
View file

@ -384,14 +384,18 @@ (define bv
;;; Hash. ;;; Hash.
;;; ;;;
(define %libgcrypt
;; Name of the libgcrypt shared library.
(compile-time-value (or (getenv "LIBGCRYPT") "libgcrypt")))
(define sha256 (define sha256
(cond (cond
((compile-time-value ((compile-time-value
(false-if-exception (dynamic-link "libgcrypt"))) (false-if-exception (dynamic-link %libgcrypt)))
;; Using libgcrypt. ;; Using libgcrypt.
(let ((hash (pointer->procedure void (let ((hash (pointer->procedure void
(dynamic-func "gcry_md_hash_buffer" (dynamic-func "gcry_md_hash_buffer"
(dynamic-link "libgcrypt")) (dynamic-link %libgcrypt))
`(,int * * ,size_t))) `(,int * * ,size_t)))
(sha256 8)) ; GCRY_MD_SHA256, as of 1.5.0 (sha256 8)) ; GCRY_MD_SHA256, as of 1.5.0
(lambda (bv) (lambda (bv)