package/lugaru: backport upstream fix
PATCH 1/1 package/lugaru: backport upstream fix
Fixes:
http://autobuild.buildroot.net/results/389/38917f8420695a9dbb24830fef04159252fceea0
Signed-off-by Romain Naour <[email protected]>
--- ...x-mismatched-usage-length-build-fail-on-g.patch | 58 ++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 package/lugaru/0002-Fix-mismatched-usage-length-build-fail-on-g.patch
package/lugaru/0002-Fix-mismatched-usage-length-build-fail-on-g.patch new file +58 -0
@@ -0,0 +1,58 @@ +From 5a0c9f6358169b447840acdb721250ce932cb180 Mon Sep 17 00:00:00 2001 +From: Martin Erik Werner <[email protected]> +Date: Wed, 8 Mar 2017 22:51:16 +0100 +Subject: [PATCH] Fix mismatched usage length, build fail on g++ +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The length of const option::Descriptor usage[] is intended to be +inferred based on the initialisation in Source/main.cpp, however, the +extern declaration in Source/Game.hpp hard-codes it to 13. + +Remove the hard-coded 13 in the extern declaration, in favour of the +inferred length. + +This also fixes the follwoing build failure with g++ (Debian 4.9.2-10) +4.9.2: +(...)/Source/main.cpp:602:5: error: uninitialized const member ?option::Descriptor::index? + }; + ^ +(...)/Source/main.cpp:602:5: warning: missing initializer for member ?option::Descriptor::index? [-Wmissing-field-initializers] +(...)/Source/main.cpp:602:5: error: uninitialized const member ?option::Descriptor::type? +(...)/Source/main.cpp:602:5: warning: missing initializer for member ?option::Descriptor::type? [-Wmissing-field-initializers] +(...)/Source/main.cpp:602:5: error: uninitialized const member ?option::Descriptor::shortopt? +(...)/Source/main.cpp:602:5: warning: missing initializer for member ?option::Descriptor::shortopt? [-Wmissing-field-initializers] +(...)/Source/main.cpp:602:5: error: uninitialized const member ?option::Descriptor::longopt? +(...)/Source/main.cpp:602:5: warning: missing initializer for member ?option::Descriptor::longopt? [-Wmissing-field-initializers] +(...)/Source/main.cpp:602:5: error: uninitialized const member ?option::Descriptor::check_arg? +(...)/Source/main.cpp:602:5: warning: missing initializer for member ?option::Descriptor::check_arg? [-Wmissing-field-initializers] +(...)/Source/main.cpp:602:5: warning: missing initializer for member ?option::Descriptor::help? [-Wmissing-field-initializers] +CMakeFiles/lugaru.dir/build.make:54: recipe for target 'CMakeFiles/lugaru.dir/Source/main.cpp.o' failed + +Signed-off-by: Martin Erik Werner <[email protected]> + +[Romain: backport to v1.2] +Signed-off-by: Romain Naour <[email protected]> + +(cherry picked from commit dd685fe9080c2853422d8272792691358ea07dfc) +--- + Source/Game.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Source/Game.hpp b/Source/Game.hpp +index 51232cc..9bb6adb 100644 +--- a/Source/Game.hpp ++++ b/Source/Game.hpp +@@ -234,7 +234,7 @@ enum optionIndex + /* Number of options + 1 */ + const int commandLineOptionsNumber = 10; + +-extern const option::Descriptor usage[13]; ++extern const option::Descriptor usage[]; + + extern option::Option commandLineOptions[commandLineOptionsNumber]; + extern option::Option* commandLineOptionsBuffer; +-- +2.9.4 +
Signature · 1 line
2.9.4
Thomas Petazzoni
AppliedPATCH 1/1 package/lugaru: backport upstream fix
Hello,
Quoted 8 lines · Romain Naour
Fixes:
http://autobuild.buildroot.net/results/389/38917f8420695a9dbb24830fef04159252fceea0Signed-off-by Romain Naour <[email protected]>--- ...x-mismatched-usage-length-build-fail-on-g.patch | 58 ++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 package/lugaru/0002-Fix-mismatched-usage-length-build-fail-on-g.patch
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 1/1 package/lugaru: backport upstream fix
In reply to Romain NaourQuoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Romain" == Romain Naour <[email protected]> writes:
Fixes:
http://autobuild.buildroot.net/results/389/38917f8420695a9dbb24830fef04159252fceea0Signed-off-by Romain Naour <[email protected]>
Committed to 2017.05.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard