From e71cf5599c91e2fa9568cbc6ffcc4fc1986c3707 Mon Sep 17 00:00:00 2001 From: Leo Date: Wed, 25 Nov 2020 07:51:02 -0300 Subject: [PATCH] main/sntpc: fix build under gcc-10 --- main/sntpc/APKBUILD | 2 ++ main/sntpc/gcc-10.patch | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 main/sntpc/gcc-10.patch diff --git a/main/sntpc/APKBUILD b/main/sntpc/APKBUILD index 63011f7bdbb..445f03b9cfb 100644 --- a/main/sntpc/APKBUILD +++ b/main/sntpc/APKBUILD @@ -9,6 +9,7 @@ arch="all" license="GPL-2.0" depends="" source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz + gcc-10.patch sntpc.initd sntpc.confd " @@ -27,5 +28,6 @@ package() { } sha512sums="c18bb0da4b7804bcbb81da65dd4ab6de4288d2475c441a7b1246631d2500b474d4e95e60cc7752762fb092b49bb6c9fd5e5290c69e247293b3e094e45d18f76d sntpc-0.9.tar.xz +f8f6801f5eb3da257f60a1cb97aed52816226638d7ddb850864a8ebfd76355ba6c9c0fb8921dc10422bb68c782489fac107c776e84feb9ff20b5b4bfda25ec09 gcc-10.patch 72a803a7393424c996b176d0e4df078b2af26b84650793cf3b7b187416878f467aca3a0c96a9cadead065d169ac80a29ae0ceb46ec4b3b26d6d552e30f3562e3 sntpc.initd 2fcb7d45f4c6588fd5281c02161a4aebb7e0a9d259a2ac3aa6c3187617dc7029f05fbebbb227feace61cc706e37ca0acb18b0019a67c674c444498fd289a9975 sntpc.confd" diff --git a/main/sntpc/gcc-10.patch b/main/sntpc/gcc-10.patch new file mode 100644 index 00000000000..ed7dbb0cfd4 --- /dev/null +++ b/main/sntpc/gcc-10.patch @@ -0,0 +1,16 @@ +Upstream: Should be +Reason: Fixes compilation under gcc-10 + +diff --git a/ntp.h b/ntp.h +index bfca553..5f8f581 100644 +--- a/ntp.h ++++ b/ntp.h +@@ -107,7 +107,7 @@ struct ntp_msg { + struct l_fixedpt orgtime; + struct l_fixedpt rectime; + struct l_fixedpt xmttime; +-} __packed; ++} __attribute__((__packed__)); + + struct ntp_query { + int fd;