Skip to contentSkip to conversation

package/netsniff-ng: fix build with gcc 10

PATCH New Fabrice Fontaine 3 participants 3 messages Sep 26, 2020 – Oct 2, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/netsniff-ng: fix build with gcc 10

Fixes:
- http://autobuild.buildroot.org/results/811b9eada9558bafde4e4ed824b36239c72e0501

---
 ...ezahn-remove-unused-MZ_SIZE_LONG_INT.patch |  41 ++++
 ...e-needlessly-global-variables-static.patch | 139 +++++++++++++
 ...-variable-definitions-cli-h-to-cli-c.patch |  77 ++++++++
 ...le-definitions-from-mops-h-to-mops-c.patch |  69 +++++++
 ...-definitions-from-llist-h-to-llist-c.patch |  47 +++++
 ...definitions-from-mz-h-to-mausezahn-c.patch | 184 ++++++++++++++++++
 6 files changed, 557 insertions(+)
 create mode 100644 package/netsniff-ng/0001-mausezahn-remove-unused-MZ_SIZE_LONG_INT.patch
 create mode 100644 package/netsniff-ng/0002-mausezahn-make-needlessly-global-variables-static.patch
 create mode 100644 package/netsniff-ng/0003-mausezahn-move-variable-definitions-cli-h-to-cli-c.patch
 create mode 100644 package/netsniff-ng/0004-mausezahn-move-variable-definitions-from-mops-h-to-mops-c.patch
 create mode 100644 package/netsniff-ng/0005-mausezahn-move-variable-definitions-from-llist-h-to-llist-c.patch
 create mode 100644 package/netsniff-ng/0006-mausezahn-move-variable-definitions-from-mz-h-to-mausezahn-c.patch
package/netsniff-ng/0001-mausezahn-remove-unused-MZ_SIZE_LONG_INT.patch new file +41 -0
new file mode 100644
index 0000000000..b07682a76d
@@ -0,0 +1,41 @@
+From c6dd9abd8d7a5332d0c1078196528926054791ae Mon Sep 17 00:00:00 2001
+From: Tobias Klauser <[email protected]>
+Date: Mon, 15 Jun 2020 18:05:09 +0200
+Subject: [PATCH] mausezahn: remove unused MZ_SIZE_LONG_INT
+
+Signed-off-by: Tobias Klauser <[email protected]>
+[Retrieved from:
+https://github.com/netsniff-ng/netsniff-ng/commit/c6dd9abd8d7a5332d0c1078196528926054791ae]
+Signed-off-by: Fabrice Fontaine <[email protected]>
+---
+ staging/mausezahn.c | 3 ---
+ staging/mz.h        | 2 --
+ 2 files changed, 5 deletions(-)
+
+diff --git a/staging/mausezahn.c b/staging/mausezahn.c
+index 6c36166e..19d2937a 100644
+--- a/staging/mausezahn.c
++++ b/staging/mausezahn.c
+@@ -192,9 +192,6 @@ int reset(void)
+    int i;
+    time_t t;
+ 
+-   // Determine platform type sizes:
+-   MZ_SIZE_LONG_INT = sizeof(long int);	     
+-
+    mz_default_config_path[0] = 0x00;
+    mz_default_log_path[0] = 0x00;
+ 
+diff --git a/staging/mz.h b/staging/mz.h
+index 5afe57d1..c7a131d8 100644
+--- a/staging/mz.h
++++ b/staging/mz.h
+@@ -108,8 +108,6 @@ static inline void verbose_l2(const char *format, ...)
+ #define IPADDRSIZE 46
+ 
+ 
+-int MZ_SIZE_LONG_INT;
+-
+ char mz_default_config_path[256];
+ char mz_default_log_path[256];
+ 
package/netsniff-ng/0002-mausezahn-make-needlessly-global-variables-static.patch new file +139 -0

139 lines not on this page · raw message

package/netsniff-ng/0003-mausezahn-move-variable-definitions-cli-h-to-cli-c.patch new file +77 -0

77 lines not on this page · raw message

package/netsniff-ng/0004-mausezahn-move-variable-definitions-from-mops-h-to-mops-c.patch new file +69 -0

69 lines not on this page · raw message

package/netsniff-ng/0005-mausezahn-move-variable-definitions-from-llist-h-to-llist-c.patch new file +47 -0

47 lines not on this page · raw message

package/netsniff-ng/0006-mausezahn-move-variable-definitions-from-mz-h-to-mausezahn-c.patch new file +184 -0

184 lines not on this page · raw message

Signature · 1 line
2.28.0
#1 lore raw

PATCH 1/1 package/netsniff-ng: fix build with gcc 10

Quoted 4 lines · On Sat, 26 Sep 2020 10:10:01 +0200 Fabrice Fontaine…

Fixes:
- http://autobuild.buildroot.org/results/811b9eada9558bafde4e4ed824b36239c72e0501

Quoted 14 lines
---
 ...ezahn-remove-unused-MZ_SIZE_LONG_INT.patch |  41 ++++
 ...e-needlessly-global-variables-static.patch | 139 +++++++++++++
 ...-variable-definitions-cli-h-to-cli-c.patch |  77 ++++++++
 ...le-definitions-from-mops-h-to-mops-c.patch |  69 +++++++
 ...-definitions-from-llist-h-to-llist-c.patch |  47 +++++
 ...definitions-from-mz-h-to-mausezahn-c.patch | 184 ++++++++++++++++++
 6 files changed, 557 insertions(+)
 create mode 100644 package/netsniff-ng/0001-mausezahn-remove-unused-MZ_SIZE_LONG_INT.patch
 create mode 100644 package/netsniff-ng/0002-mausezahn-make-needlessly-global-variables-static.patch
 create mode 100644 package/netsniff-ng/0003-mausezahn-move-variable-definitions-cli-h-to-cli-c.patch
 create mode 100644 package/netsniff-ng/0004-mausezahn-move-variable-definitions-from-mops-h-to-mops-c.patch
 create mode 100644 package/netsniff-ng/0005-mausezahn-move-variable-definitions-from-llist-h-to-llist-c.patch
 create mode 100644 package/netsniff-ng/0006-mausezahn-move-variable-definitions-from-mz-h-to-mausezahn-c.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com