aboutsummaryrefslogtreecommitdiff
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

0'>2021-12-13gnu: Remove superfluous "linux-libre-headers" inputs....This input is already propagated from glibc. * gnu/packages/chromium.scm (ungoogled-chromium)[inputs]: Remove LINUX-LIBRE-HEADERS-5.10. * gnu/packages/linux.scm (btrfs-progs)[native-inputs]: Likewise. * gnu/packages/accessibility.scm (brltty)[inputs]: Remove LINUX-LIBRE-HEADERS. * gnu/packages/graphics.scm (directfb)[inputs]: Likewise. * gnu/packages/gstreamer.scm (libdc1394)[inputs]: Likewise. * gnu/packages/linux.scm (python-evdev)[native-inputs]: Likewise. (bcc, bpftrace)[inputs]: Likewise. * gnu/packages/networking.scm (lksctp-tools)[inputs]: Likewise. * gnu/packages/video.scm (tslib)[inputs]: Likewise. * gnu/packages/web-browsers.scm (links)[native-inputs]: Likewise. * gnu/packages/cdrom.scm (cdrtools)[inputs]: Likewise. [arguments]: Adjust accordingly. * gnu/packages/lirc.scm (lirc)[inputs, arguments]: Likewise. * gnu/packages/vpn.scm (xl2tpd)[inputs, arguments]: Likewise. Marius Bakke 2021-12-13gnu: Simplify package inputs....This commit was obtained by running: ./pre-inst-env guix style without any additional argument. Ludovic Courtès 2021-12-10gnu: cdrkit-libre: Fix cross-compiling....* gnu/packages/cdrom.scm (cdrkit-libre)[source]: Add patch. * gnu/packages/patches/cdrkit-libre-cross-compile.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. Efraim Flashner 2021-11-11gnu: cdparanoia: Disable parallel build....The build would sometimes fail with errors such as: make[1]: Entering directory '/tmp/guix-build-cdparanoia-10.2.drv-0/cdparanoia-III-10.2' gcc -O2 -fsigned-char -g -O2 -c main.c gcc -O2 -fsigned-char -g -O2 -c report.c gcc -O2 -fsigned-char -g -O2 -c header.c gcc -O2 -fsigned-char -g -O2 -c buffering_write.c gcc -O2 -fsigned-char -g -O2 -c cachetest.c gcc -O2 -fsigned-char -g -O2 -Wl,-rpath=/gnu/store/h0qhcyf0ci4kb70mmvxn8150rl6d3ykm-cdparanoia-10.2/lib -g -O2 main.o report.o header.o buffering_write.o cachetest.o \ -L/tmp/guix-build-cdparanoia-10.2.drv-0/cdparanoia-III-10.2/paranoia -L/tmp/guix-build-cdparanoia-10.2.drv-0/cdparanoia-III-10.2/interface \ -o cdparanoia -lcdda_interface -lcdda_paranoia -lm -lrt ld: main.o: in function `cleanup': /tmp/guix-build-cdparanoia-10.2.drv-0/cdparanoia-III-10.2/main.c:667: undefined reference to `paranoia_free' [...] collect2: error: ld returned 1 exit status * gnu/packages/cdrom.scm (cdparanoia)[parallel-build?]: Set to #f. Maxim Cournoyer 2021-11-08Merge remote-tracking branch 'origin/master' into core-updates-frozenEfraim Flashner 2021-11-07gnu: dvdisaster: Remove uninstallation script....* gnu/packages/cdrom.scm (dvdisaster)[arguments]: Add a new 'remove-uninstall-script phase. Tobias Geerinckx-Rice 2021-11-07gnu: dvdisaster: Update to 0.79.9....* gnu/packages/cdrom.scm (dvdisaster): Update to 0.79.9. [source, home-page]: Update home page. [arguments]: Don't explicitly return #t from phases. Tobias Geerinckx-Rice 2021-10-31Merge remote-tracking branch 'origin/master' into core-updates-frozenEfraim Flashner 2021-10-21gnu: cdparanoia: Don't build in parallel....* gnu/packages/cdrom.scm (cdparanoia)[arguments]: Disable #:parallel-build?. Reported by Maxim Cournoyer <maxim.cournoyer@gmail.com> Tobias Geerinckx-Rice 2021-08-26gnu: cdrkit-libre: Fix building with gcc-10....* gnu/packages/cdrom.scm (cdrkit-libre)[source]: Add snippet to fix building with gcc-10. Efraim Flashner 2021-05-09Merge branch 'master' into core-updates... Conflicts: gnu/local.mk gnu/packages/bioinformatics.scm gnu/packages/django.scm gnu/packages/gtk.scm gnu/packages/llvm.scm gnu/packages/python-web.scm gnu/packages/python.scm gnu/packages/tex.scm guix/build-system/asdf.scm guix/build/emacs-build-system.scm guix/profiles.scm Marius Bakke