From: "Marek Szuba" <marecki@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/linuxptp/files/, net-misc/linuxptp/
Date: Thu, 5 Nov 2020 14:18:14 +0000 (UTC) [thread overview]
Message-ID: <1604585885.28c002049ff9906d32d61a3940b53e845fab3bb3.marecki@gentoo> (raw)
commit: 28c002049ff9906d32d61a3940b53e845fab3bb3
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 5 14:11:42 2020 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Nov 5 14:18:05 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28c00204
net-misc/linuxptp: fix compilation error
Invoking maintainer time-out.
Closes: https://bugs.gentoo.org/728540
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
.../files/linuxptp-2.0_nettstamp-systypes.patch | 52 ++++++++++++++++++++++
net-misc/linuxptp/linuxptp-2.0-r1.ebuild | 4 ++
2 files changed, 56 insertions(+)
diff --git a/net-misc/linuxptp/files/linuxptp-2.0_nettstamp-systypes.patch b/net-misc/linuxptp/files/linuxptp-2.0_nettstamp-systypes.patch
new file mode 100644
index 00000000000..d3f8e5d9290
--- /dev/null
+++ b/net-misc/linuxptp/files/linuxptp-2.0_nettstamp-systypes.patch
@@ -0,0 +1,52 @@
+net_tstamp.h needs clockid_t to be defined, so must include
+<sys/types.h> before including <linux/net_tstamp.h>
+
+
+--- a/clock.c
++++ b/clock.c
+@@ -17,6 +17,7 @@
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+ #include <errno.h>
++#include <sys/types.h>
+ #include <linux/net_tstamp.h>
+ #include <poll.h>
+ #include <stdlib.h>
+--- a/hwstamp_ctl.c 2018-08-12 23:08:43.000000000 +0200
++++ b/hwstamp_ctl.c 2020-02-07 13:49:53.256859722 +0100
+@@ -23,6 +23,7 @@
+ #include <string.h>
+ #include <sys/ioctl.h>
+ #include <unistd.h>
++#include <sys/types.h>
+
+ #include <arpa/inet.h>
+ #include <linux/net_tstamp.h>
+--- a/sk.c 2018-08-12 23:08:43.000000000 +0200
++++ b/sk.c 2020-02-07 13:50:12.334599236 +0100
+@@ -18,6 +18,7 @@
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+ #include <errno.h>
++#include <sys/types.h>
+ #include <linux/net_tstamp.h>
+ #include <linux/sockios.h>
+ #include <linux/ethtool.h>
+--- a/timemaster.c 2018-08-12 23:08:43.000000000 +0200
++++ b/timemaster.c 2020-02-07 13:50:19.848500949 +0100
+@@ -22,7 +22,6 @@
+ #include <errno.h>
+ #include <libgen.h>
+ #include <limits.h>
+-#include <linux/net_tstamp.h>
+ #include <net/if.h>
+ #include <signal.h>
+ #include <spawn.h>
+@@ -34,6 +33,7 @@
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ #include <unistd.h>
++#include <linux/net_tstamp.h>
+
+ #include "print.h"
+ #include "rtnl.h"
diff --git a/net-misc/linuxptp/linuxptp-2.0-r1.ebuild b/net-misc/linuxptp/linuxptp-2.0-r1.ebuild
index 60e25c5dd15..6594c946478 100644
--- a/net-misc/linuxptp/linuxptp-2.0-r1.ebuild
+++ b/net-misc/linuxptp/linuxptp-2.0-r1.ebuild
@@ -19,6 +19,10 @@ RDEPEND="${DEPEND}"
CONFIG_CHECK="~PPS ~NETWORK_PHY_TIMESTAMPING ~PTP_1588_CLOCK"
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.0_nettstamp-systypes.patch
+)
+
pkg_setup() {
linux-info_pkg_setup
}
next reply other threads:[~2020-11-05 14:18 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-05 14:18 Marek Szuba [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-12-15 10:04 [gentoo-commits] repo/gentoo:master commit in: net-misc/linuxptp/files/, net-misc/linuxptp/ Thomas Beierlein
2024-12-15 9:17 Thomas Beierlein
2023-12-24 21:07 Marek Szuba
2022-08-15 13:37 Marek Szuba
2020-07-02 15:01 Marek Szuba
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=1604585885.28c002049ff9906d32d61a3940b53e845fab3bb3.marecki@gentoo \
--to=marecki@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.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