From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 586A1138334 for ; Tue, 11 Jun 2019 21:08:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3F754E0855; Tue, 11 Jun 2019 21:08:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0EC33E0855 for ; Tue, 11 Jun 2019 21:08:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 001EA345EAF for ; Tue, 11 Jun 2019 21:08:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 89D3D605 for ; Tue, 11 Jun 2019 21:08:08 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: <1560287279.6714f9b94f5354a170dbd4b7573ca5e951d13f7d.anarchy@gentoo> Subject: [gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/files/, sys-apps/iproute2/ X-VCS-Repository: proj/musl X-VCS-Files: sys-apps/iproute2/files/iproute2-5.1.0-musl.patch sys-apps/iproute2/files/iproute2-5.1.0-portability.patch sys-apps/iproute2/iproute2-5.1.0.ebuild X-VCS-Directories: sys-apps/iproute2/files/ sys-apps/iproute2/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: 6714f9b94f5354a170dbd4b7573ca5e951d13f7d X-VCS-Branch: master Date: Tue, 11 Jun 2019 21:08:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3cb4d5a9-f678-4f2a-8a62-1a36a9e340a6 X-Archives-Hash: 78bed7f3a7bc281ff046a02b82015e4d commit: 6714f9b94f5354a170dbd4b7573ca5e951d13f7d Author: Jory Pratt gentoo org> AuthorDate: Tue Jun 11 21:07:59 2019 +0000 Commit: Jory Pratt gentoo org> CommitDate: Tue Jun 11 21:07:59 2019 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=6714f9b9 sys-apps/iproute2: prevent redefinition of sysifo properly Package-Manager: Portage-2.3.67, Repoman-2.3.14 Signed-off-by: Jory Pratt gentoo.org> sys-apps/iproute2/files/iproute2-5.1.0-musl.patch | 12 -------- .../files/iproute2-5.1.0-portability.patch | 33 ++++++++++++++++++++++ sys-apps/iproute2/iproute2-5.1.0.ebuild | 2 +- 3 files changed, 34 insertions(+), 13 deletions(-) diff --git a/sys-apps/iproute2/files/iproute2-5.1.0-musl.patch b/sys-apps/iproute2/files/iproute2-5.1.0-musl.patch deleted file mode 100644 index d53c76e..0000000 --- a/sys-apps/iproute2/files/iproute2-5.1.0-musl.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur iproute2-5.1.0.orig/devlink/devlink.c iproute2-5.1.0/devlink/devlink.c ---- iproute2-5.1.0.orig/devlink/devlink.c 2019-05-10 11:45:14.000000000 -0400 -+++ iproute2-5.1.0/devlink/devlink.c 2019-06-11 13:46:03.745336706 -0400 -@@ -22,7 +22,7 @@ - #include - #include - #include --#include -+//#include - #include - - #include "SNAPSHOT.h" diff --git a/sys-apps/iproute2/files/iproute2-5.1.0-portability.patch b/sys-apps/iproute2/files/iproute2-5.1.0-portability.patch new file mode 100644 index 0000000..3fdca40 --- /dev/null +++ b/sys-apps/iproute2/files/iproute2-5.1.0-portability.patch @@ -0,0 +1,33 @@ +From 202d79fcf4e184818bd074f8c06e94e700670898 Mon Sep 17 00:00:00 2001 +From: Jory Pratt +Date: Tue, 11 Jun 2019 01:48:01 -0500 +Subject: [PATCH] including sysinfo.h from kernel.h makes no sense whatsoever, + but removing it breaks glibc's userspace header, which includes kernel.h + instead of sysinfo.h from their sys/sysinfo.h. this seems to be a historical + mistake. on musl, including any header that uses kernel.h directly or + indirectly plus sys/sysinfo.h will produce a compile error due to + redefinition of struct sysinfo. so for now, only include it on glibc in order + not to break their headers. + +Signed-off-by: Jory Pratt +--- + include/uapi/linux/kernel.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/uapi/linux/kernel.h b/include/uapi/linux/kernel.h +index d99ffa1..f917115 100644 +--- a/include/uapi/linux/kernel.h ++++ b/include/uapi/linux/kernel.h +@@ -2,7 +2,9 @@ + #ifndef _LINUX_KERNEL_H + #define _LINUX_KERNEL_H + ++#ifdef __GLIBC__ + #include ++#endif + + /* + * 'kernel.h' contains some often-used function prototypes etc +-- +2.22.0 + diff --git a/sys-apps/iproute2/iproute2-5.1.0.ebuild b/sys-apps/iproute2/iproute2-5.1.0.ebuild index 6e75428..f2771e5 100644 --- a/sys-apps/iproute2/iproute2-5.1.0.ebuild +++ b/sys-apps/iproute2/iproute2-5.1.0.ebuild @@ -47,7 +47,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 "${FILESDIR}"/${PN}-4.20.0-configure-nomagic.patch # bug 643722 - "${FILESDIR}"/${PN}-5.1.0-musl.patch + "${FILESDIR}"/${PN}-5.1.0-portability.patch ) src_prepare() {