diff options
author | Fatih Aşıcı <fatih.asici@gmail.com> | 2013-09-20 08:43:10 +0300 |
---|---|---|
committer | Peter Korsgaard <peter@korsgaard.com> | 2013-10-26 14:00:54 +0200 |
commit | 5d85af61b7a66751ec6240bb14f7517a6633f5e7 (patch) | |
tree | a2f10cfdc2ccac5adaa0895790d10008fe9d38a2 /package/qt5/qt5jsbackend/qt5jsbackend-0002-fix-uclibc.patch | |
parent | 129abd31b7ef3e3c3c4f43324e23367f942940c9 (diff) | |
download | buildroot-5d85af61b7a66751ec6240bb14f7517a6633f5e7.tar.gz buildroot-5d85af61b7a66751ec6240bb14f7517a6633f5e7.zip |
qt5: bump to 5.1.1
Following patches are removed since they are upstreamed:
- qt5base/qt5base-0001-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch
- qt5jsbackend/qt5jsbackend-0002-fix-uclibc.patch
Remove "-nomake demos" from configure options since "demos" directory is
merged into examples.
Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Tested-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/qt5/qt5jsbackend/qt5jsbackend-0002-fix-uclibc.patch')
-rw-r--r-- | package/qt5/qt5jsbackend/qt5jsbackend-0002-fix-uclibc.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/package/qt5/qt5jsbackend/qt5jsbackend-0002-fix-uclibc.patch b/package/qt5/qt5jsbackend/qt5jsbackend-0002-fix-uclibc.patch deleted file mode 100644 index 50a6dbcacf..0000000000 --- a/package/qt5/qt5jsbackend/qt5jsbackend-0002-fix-uclibc.patch +++ /dev/null @@ -1,33 +0,0 @@ -Fix build on uClibc - -Patch taken from https://code.google.com/p/v8/source/detail?r=12094. - -Review URL: https://chromiumcodereview.appspot.com/10784012 -Patch from Remi Duraffort <remi.duraffort@st.com>. - -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> - -Index: qt5jsbackend-5.0.0/src/3rdparty/v8/src/platform-linux.cc -=================================================================== ---- qt5jsbackend-5.0.0.orig/src/3rdparty/v8/src/platform-linux.cc 2012-12-18 20:04:01.000000000 +0100 -+++ qt5jsbackend-5.0.0/src/3rdparty/v8/src/platform-linux.cc 2013-03-03 20:31:46.000000000 +0100 -@@ -1030,7 +1030,8 @@ - sample->fp = reinterpret_cast<Address>(mcontext.gregs[REG_RBP]); - #elif V8_HOST_ARCH_ARM - // An undefined macro evaluates to 0, so this applies to Android's Bionic also. --#if (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) -+#if (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3) && \ -+ !defined(__UCLIBC__)) - sample->pc = reinterpret_cast<Address>(mcontext.gregs[R15]); - sample->sp = reinterpret_cast<Address>(mcontext.gregs[R13]); - sample->fp = reinterpret_cast<Address>(mcontext.gregs[R11]); -@@ -1038,7 +1039,8 @@ - sample->pc = reinterpret_cast<Address>(mcontext.arm_pc); - sample->sp = reinterpret_cast<Address>(mcontext.arm_sp); - sample->fp = reinterpret_cast<Address>(mcontext.arm_fp); --#endif // (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) -+#endif // (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3) && -+ // !defined(__UCLIBC__)) - #elif V8_HOST_ARCH_MIPS - sample->pc = reinterpret_cast<Address>(mcontext.pc); - sample->sp = reinterpret_cast<Address>(mcontext.gregs[29]); |