mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-18 13:36:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

daemon: Fix --with-libgcrypt-* args of the configure script.

Browse source 
Since the daemon is written in C++, we need to modify CXXFLAGS
instead of CFLAGS to find include files. Use LIBGCRYPT_LDFLAGS
instead of LIBGCRYPT_LIBS, since only the former is added to
LDFLAGS.

* config-daemon.ac: Change LDFLAGS and CXXFLAGS when --with-libgcrypt-*
arguments are passed to the configure script.

Change-Id: I0f3867491e46608e71b1ea0b3214674bca64b31d
Signed-off-by: Andreas Enge <andreas@enge.fr>
This commit is contained in:
Doğan Çeçen 2024-10-30 22:41:06 +02:00 committed by Andreas Enge
parent 043f024627
commit 8a7bd211d2
No known key found for this signature in database
GPG key ID: F7D5C9BF765C61E3
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
config-daemon.ac
View file

@ -39,28 +39,26 @@ if test "x$guix_build_daemon" = "xyes"; then
case "$LIBGCRYPT_PREFIX" in
no)
LIBGCRYPT_CFLAGS=""
LIBGCRYPT_CXXFLAGS=""
;;
*)
LIBGCRYPT_CFLAGS="-I$LIBGCRYPT_PREFIX/include"
LIBGCRYPT_CXXFLAGS="-I$LIBGCRYPT_PREFIX/include"
;;
esac
case "$LIBGCRYPT_LIBDIR" in
no | "")
LIBGCRYPT_LIBS="-lgcrypt"
LIBGCRYPT_LDFLAGS="-lgcrypt"
;;
*)
LIBGCRYPT_LIBS="-L$LIBGCRYPT_LIBDIR -lgcrypt"
LIBGCRYPT_LDFLAGS="-L$LIBGCRYPT_LIBDIR -lgcrypt"
;;
esac
AC_SUBST([LIBGCRYPT_CFLAGS])
AC_SUBST([LIBGCRYPT_LIBS])
AC_SUBST([LIBGCRYPT_CXXFLAGS])
AC_SUBST([LIBGCRYPT_LDFLAGS])
save_CFLAGS="$CFLAGS"
save_LDFLAGS="$LDFLAGS"
CFLAGS="$CFLAGS $LIBGCRYPT_CFLAGS"
CXXFLAGS="$CXXFLAGS $LIBGCRYPT_CXXFLAGS"
LDFLAGS="$LDFLAGS $LIBGCRYPT_LDFLAGS"
have_gcrypt=yes
@ -70,9 +68,6 @@ if test "x$guix_build_daemon" = "xyes"; then
AC_MSG_ERROR([GNU libgcrypt not found; please install it.])
fi
CFLAGS="$save_CFLAGS"
LDFLAGS="$save_LDFLAGS"
dnl Chroot support.
AC_CHECK_FUNCS([chroot unshare])
AC_CHECK_HEADERS([sched.h sys/param.h sys/mount.h sys/syscall.h])