[2/4] webkitgtk: Add patches which allow building for ARMv8-A

Message ID 20170712235531.20444-3-aperez@igalia.com
State Superseded
Headers show

Commit Message

Adrian Perez de Castro July 12, 2017, 11:55 p.m.
The two added patches allow building WebKitGTK+ when the compiler
scpecifically targets ARMv8-A, and reports as such be pre-defining
__ARCH_ARM_8A__ instead of just __ARCH_ARM_8__. Both patches were
pulled from the corresponding upstream bug reports and edited to
remove the conflicting parts which edit the ChangeLog files.

Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
---
 ...ailure-to-build-when-the-compiler-specifica.patch | 20 ++++++++++++++++++++
 ...re-to-build-when-the-compiler-specifically-.patch | 20 ++++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 package/webkitgtk/0001-bmalloc-Failure-to-build-when-the-compiler-specifica.patch
 create mode 100644 package/webkitgtk/0002-WTF-Failure-to-build-when-the-compiler-specifically-.patch

Comments

Thomas Petazzoni July 21, 2017, 7:06 a.m. | #1
Hello,

On Thu, 13 Jul 2017 02:55:29 +0300, Adrian Perez de Castro wrote:
> The two added patches allow building WebKitGTK+ when the compiler
> scpecifically targets ARMv8-A, and reports as such be pre-defining
> __ARCH_ARM_8A__ instead of just __ARCH_ARM_8__. Both patches were
> pulled from the corresponding upstream bug reports and edited to
> remove the conflicting parts which edit the ChangeLog files.
> 
> Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
> ---
>  ...ailure-to-build-when-the-compiler-specifica.patch | 20 ++++++++++++++++++++
>  ...re-to-build-when-the-compiler-specifically-.patch | 20 ++++++++++++++++++++
>  2 files changed, 40 insertions(+)
>  create mode 100644 package/webkitgtk/0001-bmalloc-Failure-to-build-when-the-compiler-specifica.patch
>  create mode 100644 package/webkitgtk/0002-WTF-Failure-to-build-when-the-compiler-specifically-.patch

Since the webkitgtk project is maintained upstream under Git, can we
get Git formatted patches instead? Please use "git format-patch -N" to
generate them, as we don't want patch numbering inside the patches,
only in the filenames.

This is obviously also valid for PATCH 3/4 in your series.

Thanks!

Thomas
Adrian Perez de Castro July 27, 2017, 10:12 p.m. | #2
Hello,

On Fri, 21 Jul 2017 09:06:54 +0200, Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote:

> On Thu, 13 Jul 2017 02:55:29 +0300, Adrian Perez de Castro wrote:
> > The two added patches allow building WebKitGTK+ when the compiler
> > scpecifically targets ARMv8-A, and reports as such be pre-defining
> > __ARCH_ARM_8A__ instead of just __ARCH_ARM_8__. Both patches were
> > pulled from the corresponding upstream bug reports and edited to
> > remove the conflicting parts which edit the ChangeLog files.
> > 
> > Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
> > ---
> >  ...ailure-to-build-when-the-compiler-specifica.patch | 20 ++++++++++++++++++++
> >  ...re-to-build-when-the-compiler-specifically-.patch | 20 ++++++++++++++++++++
> >  2 files changed, 40 insertions(+)
> >  create mode 100644 package/webkitgtk/0001-bmalloc-Failure-to-build-when-the-compiler-specifica.patch
> >  create mode 100644 package/webkitgtk/0002-WTF-Failure-to-build-when-the-compiler-specifically-.patch

This patch is not needed anymore. The changes are already included in the
WebKitGTK+ 2.16.6 release.

> Since the webkitgtk project is maintained upstream under Git, can we
> get Git formatted patches instead? Please use "git format-patch -N" to
> generate them, as we don't want patch numbering inside the patches,
> only in the filenames.

I will take this into account for the next time, thanks.

(Technically upstream is Subversion, but most of the developers use the Git
mirror... dunno how that would affect the preferred patch format — personally
I prefer to use Git, too!)

Cheers,


--
 Adrián 🎩
Adrian Perez de Castro July 29, 2017, 12:52 p.m. | #3
On Fri, 28 Jul 2017 01:12:03 +0300, Adrian Perez de Castro <aperez@igalia.com> wrote:
> Hello,
> 
> On Fri, 21 Jul 2017 09:06:54 +0200, Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote:
> 
> > On Thu, 13 Jul 2017 02:55:29 +0300, Adrian Perez de Castro wrote:
> > > The two added patches allow building WebKitGTK+ when the compiler
> > > scpecifically targets ARMv8-A, and reports as such be pre-defining
> > > __ARCH_ARM_8A__ instead of just __ARCH_ARM_8__. Both patches were
> > > pulled from the corresponding upstream bug reports and edited to
> > > remove the conflicting parts which edit the ChangeLog files.
> > > 
> > > Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
> > > ---
> > >  ...ailure-to-build-when-the-compiler-specifica.patch | 20 ++++++++++++++++++++
> > >  ...re-to-build-when-the-compiler-specifically-.patch | 20 ++++++++++++++++++++
> > >  2 files changed, 40 insertions(+)
> > >  create mode 100644 package/webkitgtk/0001-bmalloc-Failure-to-build-when-the-compiler-specifica.patch
> > >  create mode 100644 package/webkitgtk/0002-WTF-Failure-to-build-when-the-compiler-specifically-.patch
> 
> This patch is not needed anymore. The changes are already included in the
> WebKitGTK+ 2.16.6 release.

Actually, it is still needed. I was looking at the 2.17.5 development release
when I wrote my previous e-mail. I'll re-submit it with the patches properly
formatted using “git format-patch -N”.

Sorry about the confusion :-\


--
 Adrián 🎩

Patch

diff --git a/package/webkitgtk/0001-bmalloc-Failure-to-build-when-the-compiler-specifica.patch b/package/webkitgtk/0001-bmalloc-Failure-to-build-when-the-compiler-specifica.patch
new file mode 100644
index 0000000000..7d5f6c6b47
--- /dev/null
+++ b/package/webkitgtk/0001-bmalloc-Failure-to-build-when-the-compiler-specifica.patch
@@ -0,0 +1,20 @@ 
+bmalloc: Failure to build when the compiler specifically targets ARMv8-A / defines __ARM_ARCH_8A__
+
+Upstream, from https://bugs.webkit.org/show_bug.cgi?id=174424
+
+Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
+
+diff --git a/Source/bmalloc/bmalloc/BPlatform.h b/Source/bmalloc/bmalloc/BPlatform.h
+index 45bbc249f59..597f7819d18 100644
+--- a/Source/bmalloc/bmalloc/BPlatform.h
++++ b/Source/bmalloc/bmalloc/BPlatform.h
+@@ -123,7 +123,8 @@
+ || defined(__ARM_ARCH_7S__)
+ #define BARM_ARCH_VERSION 7
+ 
+-#elif defined(__ARM_ARCH_8__)
++#elif defined(__ARM_ARCH_8__) \
++|| defined(__ARM_ARCH_8A__)
+ #define BARM_ARCH_VERSION 8
+ 
+ /* MSVC sets _M_ARM */
diff --git a/package/webkitgtk/0002-WTF-Failure-to-build-when-the-compiler-specifically-.patch b/package/webkitgtk/0002-WTF-Failure-to-build-when-the-compiler-specifically-.patch
new file mode 100644
index 0000000000..a1bf9738af
--- /dev/null
+++ b/package/webkitgtk/0002-WTF-Failure-to-build-when-the-compiler-specifically-.patch
@@ -0,0 +1,20 @@ 
+[WTF] Failure to build when the compiler specifically targets ARMv8-A / defines __ARM_ARCH_8A__
+
+Upstream, from https://bugs.webkit.org/show_bug.cgi?id=174425
+
+Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
+
+diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
+index 3d02b9c8553..9511e9e4e51 100644
+--- a/Source/WTF/wtf/Platform.h
++++ b/Source/WTF/wtf/Platform.h
+@@ -242,7 +242,8 @@
+     || defined(__ARM_ARCH_7S__)
+ #define WTF_ARM_ARCH_VERSION 7
+ 
+-#elif defined(__ARM_ARCH_8__)
++#elif defined(__ARM_ARCH_8__) \
++    || defined(__ARM_ARCH_8A__)
+ #define WTF_ARM_ARCH_VERSION 8
+ 
+ /* MSVC sets _M_ARM */