From: leahneukirchen <leahneukirchen@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] musl-legacy-compat: update to 0.6.
Date: Sat, 21 Jan 2023 23:43:16 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41789@inbox.vuxu.org> (raw)
[-- 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
next reply other threads:[~2023-01-21 22:43 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-21 22:43 leahneukirchen [this message]
2023-04-22 1:53 ` github-actions
2023-04-22 10:41 ` [PR PATCH] [Merged]: " leahneukirchen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41789@inbox.vuxu.org \
--to=leahneukirchen@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).