summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Vertes <mvertes@free.fr>2022-01-15 18:48:21 +0000
committerMarc Vertes <mvertes@free.fr>2022-01-15 18:48:21 +0000
commitd6a67e794841f6b219b7d65dc964f745b63be6a0 (patch)
treec413c12ebe96216c395075ae3a317965c8097e99
parente96f6e6c4655695b6ba650f792ab34b6eaf9315e (diff)
Do not ignore *.patch files
-rw-r--r--.gitignore2
-rw-r--r--build.mk6
-rw-r--r--sntpc/gcc-10.patch16
3 files changed, 20 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 6cd8480..b2b5c04 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,6 @@
.extract
.fetch
.install
-.patch
+.patched
*/*-*
*/*/
diff --git a/build.mk b/build.mk
index fce10b0..02b364e 100644
--- a/build.mk
+++ b/build.mk
@@ -38,7 +38,7 @@ uninstall: .install
install: .install
build: .build
configure: .configure
-patch: .patch
+patch: .patched
extract: .extract
fetch: .fetch
@@ -50,11 +50,11 @@ fetch: .fetch
cd $(dir) && $(build_cmd)
@touch $@
-.configure: .patch
+.configure: .patched
cd $(dir) && $(configure_cmd) $(configure_flags)
@touch $@
-.patch: .extract
+.patched: .extract
cd $(dir) && for f in ../*.patch; do patch -p1 < $$f || break; done
@touch $@
diff --git a/sntpc/gcc-10.patch b/sntpc/gcc-10.patch
new file mode 100644
index 0000000..ed7dbb0
--- /dev/null
+++ b/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;