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 6B89B138334 for ; Sun, 25 Nov 2018 11:21:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8A342E0937; Sun, 25 Nov 2018 11:21:29 +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 63DA8E0937 for ; Sun, 25 Nov 2018 11:21:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 9BDD1335D52 for ; Sun, 25 Nov 2018 11:21:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DD0C4442 for ; Sun, 25 Nov 2018 11:21:25 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1543144865.8fad7a82a85f3f6622425bc425c9818e8a76850c.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/radvd/, net-misc/radvd/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/radvd/files/radvd-2.14-headers.patch net-misc/radvd/radvd-2.14.ebuild X-VCS-Directories: net-misc/radvd/files/ net-misc/radvd/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 8fad7a82a85f3f6622425bc425c9818e8a76850c X-VCS-Branch: master Date: Sun, 25 Nov 2018 11:21:25 +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-Archives-Salt: 3df1d7a9-3b5c-407e-a634-4e5ab84ac1c1 X-Archives-Hash: 1c200d50eb1a1221d5bbee808e96dfa2 commit: 8fad7a82a85f3f6622425bc425c9818e8a76850c Author: Sergei Trofimovich gentoo org> AuthorDate: Sun Nov 25 11:21:05 2018 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Nov 25 11:21:05 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fad7a82 net-misc/radvd: fix build aganst linux-headers, bug #625236 Patch by Murilo Morais Closes: https://bugs.gentoo.org/625236 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Sergei Trofimovich gentoo.org> net-misc/radvd/files/radvd-2.14-headers.patch | 26 ++++++++++++++++++++++++++ net-misc/radvd/radvd-2.14.ebuild | 6 +++++- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/net-misc/radvd/files/radvd-2.14-headers.patch b/net-misc/radvd/files/radvd-2.14-headers.patch new file mode 100644 index 00000000000..36f6c3b7de4 --- /dev/null +++ b/net-misc/radvd/files/radvd-2.14-headers.patch @@ -0,0 +1,26 @@ +Fix build failure: + recv.c:17: /usr/include/linux/if_arp.h:114:8: error: redefinition of 'struct +on modern linux-headers. + +Patch by Murilo Morais +Bug: https://bugs.gentoo.org/625236 +--- a/includes.h 2015-11-19 10:58:52.000000000 -0300 ++++ b/includes.h 2017-07-15 09:32:17.024877205 -0300 +@@ -86,7 +86,7 @@ + #include + #endif + +-#if defined(HAVE_NET_IF_ARP_H) && !defined(ARPHRD_ETHER) ++#if (defined(HAVE_NET_IF_ARP_H) && !defined(ARPHRD_ETHER)) || HAVE_LINUX_IF_ARP_H + #include + #endif /* defined(HAVE_NET_IF_ARP_H) && !defined(ARPHRD_ETHER) */ + +@@ -101,8 +101,3 @@ + #ifdef HAVE_IFADDRS_H + #include + #endif +- +-#ifdef HAVE_LINUX_IF_ARP_H +-#include +-#endif +- diff --git a/net-misc/radvd/radvd-2.14.ebuild b/net-misc/radvd/radvd-2.14.ebuild index 86636435556..2dfcb3af875 100644 --- a/net-misc/radvd/radvd-2.14.ebuild +++ b/net-misc/radvd/radvd-2.14.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -33,6 +33,10 @@ pkg_setup() { [[ -d ${ROOT}/var/run/radvd ]] && chown radvd:radvd "${ROOT}"/var/run/radvd } +src_prepare() { + epatch "${FILESDIR}"/${P}-headers.patch +} + src_configure() { econf --with-pidfile=/var/run/radvd/radvd.pid \ --disable-silent-rules \