git: 175cb372bbfb - main - devel/basu: switch to upstream fix after ffe546db80d9

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Sun, 28 Nov 2021 05:14:06 UTC
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=175cb372bbfba1f6f56a2710cc8aab40512b1cea

commit 175cb372bbfba1f6f56a2710cc8aab40512b1cea
Author:     Evgeniy Khramtsov <evgeniy@khramtsov.org>
AuthorDate: 2021-11-28 03:56:15 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2021-11-28 05:13:00 +0000

    devel/basu: switch to upstream fix after ffe546db80d9
    
    PR:             258812
---
 devel/basu/Makefile          |  1 +
 devel/basu/distinfo          |  2 ++
 devel/basu/files/patch-lld13 | 23 -----------------------
 3 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/devel/basu/Makefile b/devel/basu/Makefile
index 7f0b49f53834..0daa22d80d9d 100644
--- a/devel/basu/Makefile
+++ b/devel/basu/Makefile
@@ -9,6 +9,7 @@ PATCH_SITES=	https://git.sr.ht/~emersion/${PORTNAME}/commit/
 PATCHFILES+=	928a746f7ebd.patch:-p1 # https://github.com/emersion/basu/pull/35
 PATCHFILES+=	4277dfe8077c.patch:-p1 # https://github.com/emersion/basu/pull/35
 PATCHFILES+=	f12a4efd8cb7.patch:-p1 # https://github.com/emersion/basu/pull/40
+PATCHFILES+=	5fa970e868f2.patch:-p1 # https://lists.sr.ht/~emersion/public-inbox/patches/26862
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	sd-bus library, extracted from systemd
diff --git a/devel/basu/distinfo b/devel/basu/distinfo
index 1924fd1e4c6d..36cc813dea6b 100644
--- a/devel/basu/distinfo
+++ b/devel/basu/distinfo
@@ -7,3 +7,5 @@ SHA256 (4277dfe8077c.patch) = a382955269652ddc3b6190512b77975e3ef9bcd140e02c1f5a
 SIZE (4277dfe8077c.patch) = 875
 SHA256 (f12a4efd8cb7.patch) = 652fb79fc005038dca30bd893623cad147fa5adef40627ab490ba366f8d94cd7
 SIZE (f12a4efd8cb7.patch) = 1293
+SHA256 (5fa970e868f2.patch) = 687673614b1b550f7ce60fc35aca5dec67d480aba7e3af3215a23552897f9e9c
+SIZE (5fa970e868f2.patch) = 2192
diff --git a/devel/basu/files/patch-lld13 b/devel/basu/files/patch-lld13
deleted file mode 100644
index fde89d2ea9ac..000000000000
--- a/devel/basu/files/patch-lld13
+++ /dev/null
@@ -1,23 +0,0 @@
-https://lists.sr.ht/~emersion/public-inbox/%3CCANvPQf_5qOdfbe4Tk029yVB6BHipmYfQnuuCVoTUv3N%3D2f8jfw%40mail.gmail.com%3E
-https://github.com/systemd/systemd/commit/945317a4b69d33752c9513bb8994fe8d5a786ea6
-
---- src/libsystemd/sd-bus/bus-error.h.orig	2021-01-06 13:56:51 UTC
-+++ src/libsystemd/sd-bus/bus-error.h
-@@ -28,11 +28,17 @@ int bus_error_set_errnofv(sd_bus_error *e, int error, 
-  * the bus error table, and BUS_ERROR_MAP_ELF_USE has to be used at
-  * least once per compilation unit (i.e. per library), to ensure that
-  * the error map is really added to the final binary.
-+ *
-+ * In addition, set the retain attribute so that the section cannot be
-+ * discarded by ld --gc-sections -z start-stop-gc. Older compilers would
-+ * warn for the unknown attribute, so just disable -Wattributes.
-  */
- 
- #define BUS_ERROR_MAP_ELF_REGISTER                                      \
-+        _Pragma("GCC diagnostic ignored \"-Wattributes\"")              \
-         __attribute__ ((__section__("BUS_ERROR_MAP")))                  \
-         __attribute__ ((__used__))                                      \
-+        __attribute__ ((retain))                                        \
-         __attribute__ ((aligned(8)))
- 
- #define BUS_ERROR_MAP_ELF_USE(errors)                                   \