deepcrayon/buildroot
deepcrayon/buildroot
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

package/dnsmasq: fix build with gcc 4.8

Browse source 
Fix the following build failure with gcc 4.8 raised since bump to
version 2.86 in commit 5b29096f8f:

option.c: In function 'one_opt':
option.c:2445:11: error: 'for' loop initial declarations are only allowed in C99 mode
           for (char *p = arg; *p; p++) {
           ^
option.c:2445:11: note: use option -std=c99 or -std=gnu99 to compile your code
option.c:2453:11: error: 'for' loop initial declarations are only allowed in C99 mode
           for (u8 i = 0; i < sizeof(daemon->umbrella_device); i++, arg+=2) {
           ^

Fixes:
 - http://autobuild.buildroot.org/results/39b34a4e69fc10f4bd9d4ddb0ed8c0aae5741c84

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Fabrice Fontaine 2022-01-02 18:45:56 +01:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent f384de4f4e
commit 17aa836bd7
2 changed files with 88 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
package/dnsmasq/0001-src-option.c-fix-build-with-gcc-4.8.patch Normal file
View file

@ -0,0 +1,52 @@
From 46312909d9080ff8743133fbd52427b4b2213171 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Fri, 31 Dec 2021 17:29:44 +0100
Subject: [PATCH] src/option.c: fix build with gcc 4.8
Fix the following build failure with gcc 4.8 raised since version 2.86:
option.c: In function 'one_opt':
option.c:2445:11: error: 'for' loop initial declarations are only allowed in C99 mode
for (char *p = arg; *p; p++) {
^
option.c:2445:11: note: use option -std=c99 or -std=gnu99 to compile your code
option.c:2453:11: error: 'for' loop initial declarations are only allowed in C99 mode
for (u8 i = 0; i < sizeof(daemon->umbrella_device); i++, arg+=2) {
^
Fixes:
- http://autobuild.buildroot.org/results/39b34a4e69fc10f4bd9d4ddb0ed8c0aae5741c84
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream commit 46312909d9080ff8743133fbd52427b4b2213171]
---
src/option.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/option.c b/src/option.c
index ff54def..c57f6d8 100644
--- a/src/option.c
+++ b/src/option.c
@@ -2525,7 +2525,8 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
arg += 9;
if (strlen(arg) != 16)
ret_err(gen_err);
- for (char *p = arg; *p; p++) {
+ char *p;
+ for (*p = arg; *p; p++) {
if (!isxdigit((int)*p))
ret_err(gen_err);
}
@@ -2533,7 +2534,8 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
u8 *u = daemon->umbrella_device;
char word[3];
- for (u8 i = 0; i < sizeof(daemon->umbrella_device); i++, arg+=2) {
+ u8 i;
+ for (i = 0; i < sizeof(daemon->umbrella_device); i++, arg+=2) {
memcpy(word, &(arg[0]), 2);
*u++ = strtoul(word, NULL, 16);
}
--
2.33.0

36
package/dnsmasq/0002-Fix-46312909d9080ff8743133fbd52427b4b2213171-typo.patch Normal file
View file

@ -0,0 +1,36 @@
From 2748fb81e23b71e2c44956e99321816aca91905d Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@thekelleys.org.uk>
Date: Sat, 1 Jan 2022 23:03:26 +0000
Subject: [PATCH] Fix 46312909d9080ff8743133fbd52427b4b2213171 typo.
[Upstream commit 2748fb81e23b71e2c44956e99321816aca91905d]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
src/option.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/option.c b/src/option.c
index c57f6d8..6f56ce8 100644
--- a/src/option.c
+++ b/src/option.c
@@ -357,7 +357,7 @@ static const struct myoption opts[] =
{ "dhcp-ignore-clid", 0, 0, LOPT_IGNORE_CLID },
{ "dynamic-host", 1, 0, LOPT_DYNHOST },
{ "log-debug", 0, 0, LOPT_LOG_DEBUG },
- { "umbrella", 2, 0, LOPT_UMBRELLA },
+ { "umbrella", 2, 0, LOPT_UMBRELLA },
{ "quiet-tftp", 0, 0, LOPT_QUIET_TFTP },
{ NULL, 0, 0, 0 }
};
@@ -2526,7 +2526,7 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
if (strlen(arg) != 16)
ret_err(gen_err);
char *p;
- for (*p = arg; *p; p++) {
+ for (p = arg; *p; p++) {
if (!isxdigit((int)*p))
ret_err(gen_err);
}
--
2.33.0