package/mpv: fixup fix build on powerpc64 w/ altivec
PATCH 1/1 package/mpv: fixup fix build on powerpc64 w/ altivec
The initial fix for this issue, re-including stdbool.h, is not working.
Instead, fix using the method used for other packages with a similar
problem: add -std=gnu99, which prevents bool from being redefined and removes the need for any source code change.
---
.../mpv/0002-Fix-build-on-powerpc64-altivec.patch | 28 ------------------- package/mpv/0002-fix-powerpc64-altivec.patch | 32 ++++++++++++++++++++++ 2 files changed, 32 insertions(+), 28 deletions(-) delete mode 100644 package/mpv/0002-Fix-build-on-powerpc64-altivec.patch create mode 100644 package/mpv/0002-fix-powerpc64-altivec.patch
package/mpv/0002-Fix-build-on-powerpc64-altivec.patch deleted +0 -28
@@ -1,28 +0,0 @@ -Subject: [PATCH] Work around bool type redefinition by altivec - -On powerpc64le, the SDL header from SDL2 may include altivec.h and this -(combined with -std=c99) will cause a compile failure due to bool being -redefined as a vector type. - -Re-include stdbool.h after SDL.h to restore the normal bool type. - -Signed-off-by: Sam Bobroff <[email protected]> ---- - audio/out/ao_sdl.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/audio/out/ao_sdl.c b/audio/out/ao_sdl.c -index d9d0062..0cb80d6 100644 ---- a/audio/out/ao_sdl.c -+++ b/audio/out/ao_sdl.c -@@ -29,6 +29,7 @@ - #include "osdep/timer.h" - - #include <SDL.h> -+#include <stdbool.h> - - struct priv - { --- -2.10.0.297.gf6727b0 -
package/mpv/0002-fix-powerpc64-altivec.patch new file +32 -0
@@ -0,0 +1,32 @@ +Subject: [PATCH] Work around bool type redefinition by altivec + +On powerpc64le, the SDL header may include altivec.h and this +(combined with -std=c99) will cause a compile failure due to bool +being redefined as a vector type. + +Adjust the compiler flags to add -std=gnu99 (which is compatible with +altivec) when using gcc. The generic flag '-std=c99' is left in place for other +compilers (in the gcc case it is overridden by the (later) gnu flag). + +Signed-off-by: Sam Bobroff <[email protected]> +--- + waftools/detections/compiler.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/waftools/detections/compiler.py b/waftools/detections/compiler.py +index 5bbba87..50836a2 100644 +--- a/waftools/detections/compiler.py ++++ b/waftools/detections/compiler.py +@@ -43,7 +43,8 @@ def __add_gcc_flags__(ctx): + "-Wno-switch", "-Wparentheses", "-Wpointer-arith", + "-Wno-pointer-sign", + # GCC bug 66425 +- "-Wno-unused-result"] ++ "-Wno-unused-result", ++ "-std=gnu99"] + + def __add_clang_flags__(ctx): + ctx.env.CFLAGS += ["-Wno-logical-op-parentheses", "-fcolor-diagnostics", +-- +2.10.0.297.gf6727b0 +
Signature · 1 line
2.11.0
PATCH 1/1 package/mpv: fixup fix build on powerpc64 w/ altivec
Sam, All,
On 2016-12-19 10:31 +1100, Sam Bobroff spake thusly:
Quoted 10 lines
The initial fix for this issue, re-including
stdbool.h, is not working.Instead, fix using the method used for other packages with a similar
problem: add -std=gnu99, which prevents bool from being redefined and removes the need for any source code change.Fixes 64904f0f6d691cfea5ae1c8f58e2d61aac0684c2Signed-off-by Sam Bobroff <[email protected]>
Regards,
Yann E. MORIN.
Quoted 87 lines
---
.../mpv/0002-Fix-build-on-powerpc64-altivec.patch | 28 ------------------- package/mpv/0002-fix-powerpc64-altivec.patch | 32 ++++++++++++++++++++++ 2 files changed, 32 insertions(+), 28 deletions(-) delete mode 100644 package/mpv/0002-Fix-build-on-powerpc64-altivec.patch create mode 100644 package/mpv/0002-fix-powerpc64-altivec.patchpackage/mpv/0002-Fix-build-on-powerpc64-altivec.patch deleted +0
-28@@ -1,28 +0,0 @@ -Subject: [PATCH] Work around bool type redefinition by altivec - -On powerpc64le, the SDL header from SDL2 may include altivec.h and this -(combined with -std=c99) will cause a compile failure due to bool being -redefined as a vector type. - -Re-include stdbool.h after SDL.h to restore the normal bool type. - -Signed-off-by: Sam Bobroff <[email protected]> ---- - audio/out/ao_sdl.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/audio/out/ao_sdl.c b/audio/out/ao_sdl.c -index d9d0062..0cb80d6 100644 ---- a/audio/out/ao_sdl.c -+++ b/audio/out/ao_sdl.c -@@ -29,6 +29,7 @@ - #include "osdep/timer.h" - - #include <SDL.h> -+#include <stdbool.h> - - struct priv - { --- -2.10.0.297.gf6727b0 -package/mpv/0002-fix-powerpc64-altivec.patch new file +32
-0@@ -0,0 +1,32 @@ +Subject: [PATCH] Work around bool type redefinition by altivec + +On powerpc64le, the SDL header may include altivec.h and this +(combined with -std=c99) will cause a compile failure due to bool +being redefined as a vector type. + +Adjust the compiler flags to add -std=gnu99 (which is compatible with +altivec) when using gcc. The generic flag '-std=c99' is left in place for other +compilers (in the gcc case it is overridden by the (later) gnu flag). + +Signed-off-by: Sam Bobroff <[email protected]> +--- + waftools/detections/compiler.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/waftools/detections/compiler.py b/waftools/detections/compiler.py +index 5bbba87..50836a2 100644 +--- a/waftools/detections/compiler.py ++++ b/waftools/detections/compiler.py +@@ -43,7 +43,8 @@ def __add_gcc_flags__(ctx): + "-Wno-switch", "-Wparentheses", "-Wpointer-arith", + "-Wno-pointer-sign", + # GCC bug 66425 +- "-Wno-unused-result"] ++ "-Wno-unused-result", ++ "-std=gnu99"] + + def __add_clang_flags__(ctx): + ctx.env.CFLAGS += ["-Wno-logical-op-parentheses", "-fcolor-diagnostics", +-- +2.10.0.297.gf6727b0 +Signature · 6 lines
2.11.0 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 1/1 package/mpv: fixup fix build on powerpc64 w/ altivec
In reply to Sam BobroffQuoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Sam" == Sam Bobroff <[email protected]> writes:
The initial fix for this issue, re-including
stdbool.h, is not working.
Quoted 7 lines
Instead, fix using the method used for other packages with a similar
problem: add -std=gnu99, which prevents bool from being redefined and removes the need for any source code change.Fixes 64904f0f6d691cfea5ae1c8f58e2d61aac0684c2Signed-off-by Sam Bobroff <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard