[PR PATCH] musl-legacy-compat: update to 0.6.

[PR PATCH] musl-legacy-compat: update to 0.6.

[leahneukirchen]

[-- Attachment #1: Type: text/plain, Size: 549 bytes --]

There is a new pull request by leahneukirchen against master on the void-packages repository

https://github.com/leahneukirchen/void-packages musl-sys-tree
https://github.com/void-linux/void-packages/pull/41789

musl-legacy-compat: update to 0.6.
Fix <sys/tree.h> usage of __unused.

Fixes #41769.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**


A patch file from https://github.com/void-linux/void-packages/pull/41789.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-musl-sys-tree-41789.patch --]
[-- Type: text/x-diff, Size: 3515 bytes --]

From 43c49561423fc91f6c05c3cabf63fb5eeaf1b28a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 21 Jan 2023 23:36:20 +0100
Subject: [PATCH] musl-legacy-compat: update to 0.6.

Fix <sys/tree.h> usage of __unused.
---
 srcpkgs/musl-legacy-compat/files/tree.h | 23 +++++++++++++++++++----
 srcpkgs/musl-legacy-compat/template     |  2 +-
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/musl-legacy-compat/files/tree.h b/srcpkgs/musl-legacy-compat/files/tree.h
index eaea56aae39b..e13d3c4da9b7 100644
--- a/srcpkgs/musl-legacy-compat/files/tree.h
+++ b/srcpkgs/musl-legacy-compat/files/tree.h
@@ -1,5 +1,6 @@
 /*	$NetBSD: tree.h,v 1.20 2013/09/14 13:20:45 joerg Exp $	*/
 /*	$OpenBSD: tree.h,v 1.13 2011/07/09 00:19:45 pirofti Exp $	*/
+/*	Modified by Void Linux. */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * All rights reserved.
@@ -28,6 +29,20 @@
 #ifndef	_SYS_TREE_H_
 #define	_SYS_TREE_H_
 
+#ifdef __GNUC__
+#define	__GNUC_PREREQ__(x, y)						\
+	((__GNUC__ == (x) && __GNUC_MINOR__ >= (y)) ||			\
+	 (__GNUC__ > (x)))
+#else
+#define	__GNUC_PREREQ__(x, y)	0
+#endif
+
+#if __GNUC_PREREQ__(2, 7) || defined(__lint__)
+#define	_sys_tree_h_unused	__attribute__((__unused__))
+#else
+#define	_sys_tree_h_unused	/* delete */
+#endif
+
 /*
  * This file defines data structures for different types of trees:
  * splay trees and red-black trees.
@@ -130,7 +145,7 @@ name##_SPLAY_FIND(struct name *head, struct type *elm)			\
 	return (NULL);							\
 }									\
 									\
-static __inline __unused struct type *					\
+static __inline _sys_tree_h_unused struct type *			\
 name##_SPLAY_NEXT(struct name *head, struct type *elm)			\
 {									\
 	name##_SPLAY(head, elm);					\
@@ -144,7 +159,7 @@ name##_SPLAY_NEXT(struct name *head, struct type *elm)			\
 	return (elm);							\
 }									\
 									\
-static __unused __inline struct type *					\
+static _sys_tree_h_unused __inline struct type *			\
 name##_SPLAY_MIN_MAX(struct name *head, int val)			\
 {									\
 	name##_SPLAY_MINMAX(head, val);					\
@@ -377,7 +392,7 @@ struct {								\
 #define RB_PROTOTYPE(name, type, field, cmp)				\
 	RB_PROTOTYPE_INTERNAL(name, type, field, cmp,)
 #define	RB_PROTOTYPE_STATIC(name, type, field, cmp)			\
-	RB_PROTOTYPE_INTERNAL(name, type, field, cmp, __unused static)
+	RB_PROTOTYPE_INTERNAL(name, type, field, cmp, _sys_tree_h_unused static)
 #define RB_PROTOTYPE_INTERNAL(name, type, field, cmp, attr)		\
 attr void name##_RB_INSERT_COLOR(struct name *, struct type *);		\
 attr void name##_RB_REMOVE_COLOR(struct name *, struct type *, struct type *);\
@@ -396,7 +411,7 @@ attr struct type *name##_RB_MINMAX(struct name *, int);			\
 #define	RB_GENERATE(name, type, field, cmp)				\
 	RB_GENERATE_INTERNAL(name, type, field, cmp,)
 #define	RB_GENERATE_STATIC(name, type, field, cmp)			\
-	RB_GENERATE_INTERNAL(name, type, field, cmp, __unused static)
+	RB_GENERATE_INTERNAL(name, type, field, cmp, _sys_tree_h_unused static)
 #define RB_GENERATE_INTERNAL(name, type, field, cmp, attr)		\
 attr void								\
 name##_RB_INSERT_COLOR(struct name *head, struct type *elm)		\
diff --git a/srcpkgs/musl-legacy-compat/template b/srcpkgs/musl-legacy-compat/template
index f68bd9922512..d19f7c1983c2 100644
--- a/srcpkgs/musl-legacy-compat/template
+++ b/srcpkgs/musl-legacy-compat/template
@@ -1,6 +1,6 @@
 # Template file for 'musl-legacy-compat'
 pkgname=musl-legacy-compat
-version=0.5
+version=0.6
 revision=1
 archs="*-musl"
 bootstrap=yes

Re: musl-legacy-compat: update to 0.6.

[github-actions]

[-- Attachment #1: Type: text/plain, Size: 305 bytes --]

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/41789#issuecomment-1518466210

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

Re: [PR PATCH] [Merged]: musl-legacy-compat: update to 0.6.

[leahneukirchen]

[-- Attachment #1: Type: text/plain, Size: 378 bytes --]

There's a merged pull request on the void-packages repository

musl-legacy-compat: update to 0.6.
https://github.com/void-linux/void-packages/pull/41789

Description:
Fix <sys/tree.h> usage of __unused.

Fixes #41769.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**