diff options
author | Marius Bakke <marius@gnu.org> | 2021-07-29 22:34:57 +0200 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2021-07-29 22:34:57 +0200 |
commit | b029be2ee0f81cdcbc14240ff426408085ab0a40 (patch) | |
tree | ed6d0e1bfdadfd28e1eb804e43763b793baa0b42 /gnu/packages/patches/esmtp-add-lesmtp.patch | |
parent | bc55f3091bac4677df0cf020381c554921fea179 (diff) | |
parent | ffb381856d0c6cc1a557b789f6b377cfa17002a0 (diff) | |
download | guix-patches-b029be2ee0f81cdcbc14240ff426408085ab0a40.tar guix-patches-b029be2ee0f81cdcbc14240ff426408085ab0a40.tar.gz |
Merge branch 'master' into core-updates-frozen
Conflicts:
gnu/packages/bioinformatics.scm
gnu/packages/cmake.scm
gnu/packages/curl.scm
gnu/packages/emacs-xyz.scm
gnu/packages/gpodder.scm
gnu/packages/music.scm
gnu/packages/patches/glibc-bootstrap-system.patch
gnu/packages/python-xyz.scm
gnu/packages/shells.scm
gnu/packages/statistics.scm
Diffstat (limited to 'gnu/packages/patches/esmtp-add-lesmtp.patch')
-rw-r--r-- | gnu/packages/patches/esmtp-add-lesmtp.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/gnu/packages/patches/esmtp-add-lesmtp.patch b/gnu/packages/patches/esmtp-add-lesmtp.patch new file mode 100644 index 0000000000..eb863cd397 --- /dev/null +++ b/gnu/packages/patches/esmtp-add-lesmtp.patch @@ -0,0 +1,37 @@ +From 9b09ff673954c459218e2c664386286ca68aae51 Mon Sep 17 00:00:00 2001 +From: Tobias Geerinckx-Rice <me@tobias.gr> +Date: Sat, 24 Jul 2021 23:55:26 +0200 +Subject: [PATCH] gnu: esmtp: Always assume that -lesmtp will work. + +libesmtp 1.1.0 removed the libesmtp-config helper in favour of pkg-config. +This does not use that (I lack the chops and the patience). Assume that +the build environment has everything set up for us, which is true on Guix. +--- + configure.ac | 11 ++--------- + 1 file changed, 2 insertions(+), 9 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 9252ec2..7ccf71a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -32,15 +32,8 @@ then + AC_CHECK_HEADER(libesmtp.h, ,[AC_MSG_ERROR([libesmtp.h not found in $with_libesmtp])]) + fi + AC_MSG_CHECKING(for libESMTP) +-if libesmtp-config --version > /dev/null 2>&1 +-then +- AC_MSG_RESULT(yes) +- CFLAGS="$CFLAGS `libesmtp-config --cflags`" +- LIBS="$LIBS `libesmtp-config --libs`" +-else +- AC_MSG_RESULT(no) +- AC_MSG_ERROR(libESMTP library not found) +-fi ++AC_MSG_RESULT(assumed) ++LIBS="$LIBS -lesmtp" + + jrf_FUNC_GETOPT + +-- +2.32.0 + |