Attachment #229762 for bug #258812

Lines 9-14 PATCH_SITES= https://git.sr.ht/~emersion/${PORTNAME}/commit/ Link Here

(-)b/devel/basu/Makefile (+1 lines)
9	PATCHFILES+= 928a746f7ebd.patch:-p1 # https://github.com/emersion/basu/pull/35	9	PATCHFILES+= 928a746f7ebd.patch:-p1 # https://github.com/emersion/basu/pull/35
10	PATCHFILES+= 4277dfe8077c.patch:-p1 # https://github.com/emersion/basu/pull/35	10	PATCHFILES+= 4277dfe8077c.patch:-p1 # https://github.com/emersion/basu/pull/35
11	PATCHFILES+= f12a4efd8cb7.patch:-p1 # https://github.com/emersion/basu/pull/40	11	PATCHFILES+= f12a4efd8cb7.patch:-p1 # https://github.com/emersion/basu/pull/40
		12	PATCHFILES+= 5fa970e868f2.patch:-p1 # https://lists.sr.ht/~emersion/public-inbox/patches/26862
12		13
13	MAINTAINER= jbeich@FreeBSD.org	14	MAINTAINER= jbeich@FreeBSD.org
14	COMMENT= sd-bus library, extracted from systemd	15	COMMENT= sd-bus library, extracted from systemd

Lines 1-4 Link Here

(-)b/devel/basu/distinfo (-1 / +3 lines)
1	TIMESTAMP = 1609941411	1	TIMESTAMP = 1638071625
2	SHA256 (basu-v0.2.0.tar.gz) = 673006f9ded754963249024b30319d7179665fde5a685d4b3b1a98d1a209a951	2	SHA256 (basu-v0.2.0.tar.gz) = 673006f9ded754963249024b30319d7179665fde5a685d4b3b1a98d1a209a951
3	SIZE (basu-v0.2.0.tar.gz) = 238871	3	SIZE (basu-v0.2.0.tar.gz) = 238871
4	SHA256 (928a746f7ebd.patch) = d42af762217f7e0f189dcc1221d0ae6779d9e4be079acf9920e2585ecfd6e3c4	4	SHA256 (928a746f7ebd.patch) = d42af762217f7e0f189dcc1221d0ae6779d9e4be079acf9920e2585ecfd6e3c4
Lines 7-9 SHA256 (4277dfe8077c.patch) = a382955269652ddc3b6190512b77975e3ef9bcd140e02c1f5a Link Here
7	SIZE (4277dfe8077c.patch) = 875	7	SIZE (4277dfe8077c.patch) = 875
8	SHA256 (f12a4efd8cb7.patch) = 652fb79fc005038dca30bd893623cad147fa5adef40627ab490ba366f8d94cd7	8	SHA256 (f12a4efd8cb7.patch) = 652fb79fc005038dca30bd893623cad147fa5adef40627ab490ba366f8d94cd7
9	SIZE (f12a4efd8cb7.patch) = 1293	9	SIZE (f12a4efd8cb7.patch) = 1293
		10	SHA256 (5fa970e868f2.patch) = 687673614b1b550f7ce60fc35aca5dec67d480aba7e3af3215a23552897f9e9c
		11	SIZE (5fa970e868f2.patch) = 2192




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)                                   \
- 

Return to bug 258812

Removed Link Here

(-)a/devel/basu/files/patch-lld13 (-24 lines)
1	https://lists.sr.ht/~emersion/public-inbox/%3CCANvPQf_5qOdfbe4Tk029yVB6BHipmYfQnuuCVoTUv3N%3D2f8jfw%40mail.gmail.com%3E
2	https://github.com/systemd/systemd/commit/945317a4b69d33752c9513bb8994fe8d5a786ea6
3
4	--- src/libsystemd/sd-bus/bus-error.h.orig 2021-01-06 13:56:51 UTC
5	+++ src/libsystemd/sd-bus/bus-error.h
6	@@ -28,11 +28,17 @@ int bus_error_set_errnofv(sd_bus_error *e, int error,
7	* the bus error table, and BUS_ERROR_MAP_ELF_USE has to be used at
8	* least once per compilation unit (i.e. per library), to ensure that
9	* the error map is really added to the final binary.
10	+ *
11	+ * In addition, set the retain attribute so that the section cannot be
12	+ * discarded by ld --gc-sections -z start-stop-gc. Older compilers would
13	+ * warn for the unknown attribute, so just disable -Wattributes.
14	*/
15
16	#define BUS_ERROR_MAP_ELF_REGISTER \
17	+ _Pragma("GCC diagnostic ignored \"-Wattributes\"") \
18	__attribute__ ((__section__("BUS_ERROR_MAP"))) \
19	__attribute__ ((__used__)) \
20	+ __attribute__ ((retain)) \
21	__attribute__ ((aligned(8)))
22
23	#define BUS_ERROR_MAP_ELF_USE(errors) \
24	-