amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: esmtp: Fix build with libesmtp >= 1.1.0.

Browse source 
* gnu/packages/mail.scm (esmtp)[source]: Add patch.
* gnu/packages/patches/esmtp-add-lesmtp.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
This commit is contained in:
Tobias Geerinckx-Rice 2021-07-24 23:57:29 +02:00
parent e463e09dc2
commit c7b51b799d
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
3 changed files with 40 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

37
gnu/packages/patches/esmtp-add-lesmtp.patch Normal file
View file

@ -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