summaryrefslogtreecommitdiff
path: root/net-mail/cyrus-imapd/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-09-15 05:12:09 +0100
committerV3n3RiX <venerix@koprulu.sector>2022-09-15 05:12:09 +0100
commitd49d63ee52f4026f7871f4ce062c172ba5e62b74 (patch)
tree8651e664517755edac13eef87d2f4dfb9ad3e968 /net-mail/cyrus-imapd/files
parent5bcf7bb4786021fc77303fae7934b17d525f9ad6 (diff)
gentoo auto-resync : 15:09:2022 - 05:12:09
Diffstat (limited to 'net-mail/cyrus-imapd/files')
-rw-r--r--net-mail/cyrus-imapd/files/cyrus-imapd-3.4.4-0001-Test-for-libm.patch32
-rw-r--r--net-mail/cyrus-imapd/files/cyrus-imapd-3.4.4-0002-Avoid-underlinking-libcyrus-lm.patch23
2 files changed, 55 insertions, 0 deletions
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-3.4.4-0001-Test-for-libm.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-3.4.4-0001-Test-for-libm.patch
new file mode 100644
index 000000000000..4a3d197ef57b
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/cyrus-imapd-3.4.4-0001-Test-for-libm.patch
@@ -0,0 +1,32 @@
+https://github.com/cyrusimap/cyrus-imapd/pull/4235
+https://bugs.gentoo.org/721466
+
+From e23a32e0516803b99ae18f0c4d5d42b59a2af111 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 15 Sep 2022 00:55:20 +0100
+Subject: [PATCH 1/2] Test for libm
+
+Test for -lm to avoid hardcoding it.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1729,7 +1729,7 @@ master_master_SOURCES = \
+ master/masterconf.c \
+ master/masterconf.h \
+ master/service.h
+-master_master_LDADD = lib/libcyrus_min.la $(LIBS) $(GCOV_LIBS) -lm
++master_master_LDADD = lib/libcyrus_min.la $(LIBS) $(GCOV_LIBS) $(LIBM)
+
+
+ netnews_remotepurge_SOURCES = \
+--- a/configure.ac
++++ b/configure.ac
+@@ -143,6 +143,7 @@ if test $ac_cv_sys_long_file_names = no; then
+ AC_MSG_ERROR(The Cyrus IMAPD requires support for long file names)
+ fi
+ AC_C_INLINE
++LT_LIB_M
+
+ gl_VISIBILITY
+ AH_BOTTOM([#if HAVE_VISIBILITY
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-3.4.4-0002-Avoid-underlinking-libcyrus-lm.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-3.4.4-0002-Avoid-underlinking-libcyrus-lm.patch
new file mode 100644
index 000000000000..5a96cdb7c1c1
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/cyrus-imapd-3.4.4-0002-Avoid-underlinking-libcyrus-lm.patch
@@ -0,0 +1,23 @@
+https://github.com/cyrusimap/cyrus-imapd/pull/4235
+https://bugs.gentoo.org/721466
+
+From 6fb292c3a071febfdb514589f12cc8d4b7329b53 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 15 Sep 2022 00:54:51 +0100
+Subject: [PATCH 2/2] Avoid underlinking libcyrus (-lm)
+
+Fixes building with lld.
+
+Bug: https://bugs.gentoo.org/721466
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1538,7 +1538,7 @@ lib_libcyrus_la_SOURCES += lib/nonblock_fcntl.c
+ else
+ lib_libcyrus_la_SOURCES += lib/nonblock_ioctl.c
+ endif
+-lib_libcyrus_la_LIBADD = libcrc32.la ${LIB_SASL} $(SSL_LIBS) $(GCOV_LIBS)
++lib_libcyrus_la_LIBADD = libcrc32.la ${LIB_SASL} $(SSL_LIBS) $(GCOV_LIBS) $(LIBM)
+ lib_libcyrus_la_CFLAGS = $(AM_CFLAGS) $(CFLAG_VISIBILITY)
+
+ if USE_ZEROSKIP