Date: Sun, 13 Aug 2023 17:38:55 GMT
From: Hajimu UMEMOTO <ume@FreeBSD.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject: git: 182235082adf - main - mail/cyrus-imapd{25,30,32}: Fix build with more recent Perl
Message-ID: <202308131738.37DHctds035150@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by ume: URL: https://cgit.FreeBSD.org/ports/commit/?id=182235082adf5e652423da7efae779c269b0bfa3 commit 182235082adf5e652423da7efae779c269b0bfa3 Author: Hajimu UMEMOTO <ume@FreeBSD.org> AuthorDate: 2023-08-13 17:14:45 +0000 Commit: Hajimu UMEMOTO <ume@FreeBSD.org> CommitDate: 2023-08-13 17:38:04 +0000 mail/cyrus-imapd{25,30,32}: Fix build with more recent Perl PR: 273093 Reported by: delphij Submitted by: delphij --- mail/cyrus-imapd25/files/patch-lib_assert.h | 16 ++++++++++++++++ mail/cyrus-imapd30/files/patch-lib_assert.h | 14 ++++++++------ mail/cyrus-imapd32/files/patch-lib_assert.h | 14 ++++++++------ 3 files changed, 32 insertions(+), 12 deletions(-) diff --git a/mail/cyrus-imapd25/files/patch-lib_assert.h b/mail/cyrus-imapd25/files/patch-lib_assert.h new file mode 100644 index 000000000000..7f74a47ca1fd --- /dev/null +++ b/mail/cyrus-imapd25/files/patch-lib_assert.h @@ -0,0 +1,16 @@ +--- lib/assert.h.orig 2021-03-09 02:28:07 UTC ++++ lib/assert.h +@@ -43,11 +43,13 @@ + #ifndef INCLUDED_ASSERT_H + #define INCLUDED_ASSERT_H + ++#ifndef PERL_POLLUTE + #ifdef __STDC__ + #define assert(ex) {if (!(ex))assertionfailed(__FILE__, __LINE__, #ex);} + void assertionfailed(const char *file, int line, const char *expr); + #else + #define assert(ex) {if (!(ex))assertionfailed(__FILE__, __LINE__, (char*)0);} ++#endif + #endif + + #endif /* INCLUDED_ASSERT_H */ diff --git a/mail/cyrus-imapd30/files/patch-lib_assert.h b/mail/cyrus-imapd30/files/patch-lib_assert.h index 28e06f17a2e7..d08160833f7c 100644 --- a/mail/cyrus-imapd30/files/patch-lib_assert.h +++ b/mail/cyrus-imapd30/files/patch-lib_assert.h @@ -1,9 +1,10 @@ ---- lib/assert.h.orig 2017-09-02 01:09:05 UTC +--- lib/assert.h.orig 2023-02-12 23:06:46 UTC +++ lib/assert.h -@@ -43,6 +43,10 @@ +@@ -43,11 +43,21 @@ #ifndef INCLUDED_ASSERT_H #define INCLUDED_ASSERT_H ++#ifndef PERL_POLLUTE +#ifdef __cplusplus +extern "C" { +#endif @@ -11,12 +12,13 @@ #ifdef __STDC__ #define assert(ex) {if (!(ex))assertionfailed(__FILE__, __LINE__, #ex);} void assertionfailed(const char *file, int line, const char *expr); -@@ -50,4 +54,8 @@ void assertionfailed(const char *file, i + #else #define assert(ex) {if (!(ex))assertionfailed(__FILE__, __LINE__, (char*)0);} - #endif - ++#endif ++ +#ifdef __cplusplus +} +#endif -+ + #endif + #endif /* INCLUDED_ASSERT_H */ diff --git a/mail/cyrus-imapd32/files/patch-lib_assert.h b/mail/cyrus-imapd32/files/patch-lib_assert.h index 28e06f17a2e7..d08160833f7c 100644 --- a/mail/cyrus-imapd32/files/patch-lib_assert.h +++ b/mail/cyrus-imapd32/files/patch-lib_assert.h @@ -1,9 +1,10 @@ ---- lib/assert.h.orig 2017-09-02 01:09:05 UTC +--- lib/assert.h.orig 2023-02-12 23:06:46 UTC +++ lib/assert.h -@@ -43,6 +43,10 @@ +@@ -43,11 +43,21 @@ #ifndef INCLUDED_ASSERT_H #define INCLUDED_ASSERT_H ++#ifndef PERL_POLLUTE +#ifdef __cplusplus +extern "C" { +#endif @@ -11,12 +12,13 @@ #ifdef __STDC__ #define assert(ex) {if (!(ex))assertionfailed(__FILE__, __LINE__, #ex);} void assertionfailed(const char *file, int line, const char *expr); -@@ -50,4 +54,8 @@ void assertionfailed(const char *file, i + #else #define assert(ex) {if (!(ex))assertionfailed(__FILE__, __LINE__, (char*)0);} - #endif - ++#endif ++ +#ifdef __cplusplus +} +#endif -+ + #endif + #endif /* INCLUDED_ASSERT_H */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308131738.37DHctds035150>