| Message ID | 20170729131639.28156-1-aperez@igalia.com |
|---|---|
| State | Accepted |
| Headers | show |
Hello, On Sat, 29 Jul 2017 16:16:39 +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. You did not remove the parts that edit the ChangeLog files it seems, and therefore, those patches don't apply to webkitgtk. There is no Source/WTF/ChangeLog file in the extracted tarball: >>> webkitgtk 2.16.6 Extracting xzcat /home/thomas/dl/webkitgtk-2.16.6.tar.xz | tar --strip-components=1 -C /home/thomas/projets/buildroot/output/build/webkitgtk-2.16.6 -xf - >>> webkitgtk 2.16.6 Patching Applying 0001-WTF-Failure-to-build-when-the-compiler-specifically-.patch using patch: can't find file to patch at input line 25 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |From 136a378d3ce1f81676aafac4a6e225db76dafa29 Mon Sep 17 00:00:00 2001 |From: "aperez@igalia.com" | <aperez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> |Date: Wed, 12 Jul 2017 18:42:29 +0000 |Subject: [PATCH] [WTF] Failure to build when the compiler specifically targets | ARMv8-A / defines __ARM_ARCH_8A__ | https://bugs.webkit.org/show_bug.cgi?id=174425 | |Reviewed by Michael Catanzaro. | |* wtf/Platform.h: Also check for __ARCH_ARM_8A__ to detect ARMv8. | |Signed-off-by: Adrian Perez de Castro <aperez@igalia.com> | |git-svn-id: http://svn.webkit.org/repository/webkit/trunk@219415 268f45cc-cd09-0410-ab3c-d52691b4dbfc |--- | Source/WTF/ChangeLog | 9 +++++++++ | Source/WTF/wtf/Platform.h | 3 ++- | 2 files changed, 11 insertions(+), 1 deletion(-) | |diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog |index 819c6627423..d5c67f2acae 100644 |--- a/Source/WTF/ChangeLog |+++ b/Source/WTF/ChangeLog -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored patching file Source/WTF/wtf/Platform.h package/pkg-generic.mk:191: recipe for target '/home/thomas/projets/buildroot/output/build/webkitgtk-2.16.6/.stamp_patched' failed Best regards, Thomas
Hello, On Sat, 29 Jul 2017 15:31:46 +0200, Thomas Petazzoni wrote: > Hello, > > On Sat, 29 Jul 2017 16:16:39 +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. > > You did not remove the parts that edit the ChangeLog files it seems, > and therefore, those patches don't apply to webkitgtk. There is no > Source/WTF/ChangeLog file in the extracted tarball: Sorry, you sent a v3, and I had applied your v2... but replied to your v3. Your v3 looks good, I'll apply. Sorry for the noise :/ Thomas
Hello, On Sat, 29 Jul 2017 16:16:39 +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> > > --- > Changes v2 -> v3: > - Remove hunks for ChangeLog edits, which are not present in releases. Applied to master, thanks. Thomas
On Sat, 29 Jul 2017 15:33:55 +0200, Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote: > Hello, > > On Sat, 29 Jul 2017 15:31:46 +0200, Thomas Petazzoni wrote: > > Hello, > > > > On Sat, 29 Jul 2017 16:16:39 +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. > > > > You did not remove the parts that edit the ChangeLog files it seems, > > and therefore, those patches don't apply to webkitgtk. There is no > > Source/WTF/ChangeLog file in the extracted tarball: > > Sorry, you sent a v3, and I had applied your v2... but replied to your > v3. > > Your v3 looks good, I'll apply. > > Sorry for the noise :/ No problem. It seems I've been a bit sleepy today when sending this O:-) Cheers, -- Adrián 🎩
>>>>> "Adrian" == Adrian Perez de Castro <aperez@igalia.com> writes: > 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> > --- > Changes v2 -> v3: > - Remove hunks for ChangeLog edits, which are not present in releases. Committed to 2017.02.x, thanks.
diff --git a/package/webkitgtk/0001-WTF-Failure-to-build-when-the-compiler-specifically-.patch b/package/webkitgtk/0001-WTF-Failure-to-build-when-the-compiler-specifically-.patch new file mode 100644 index 0000000000..017771a07d --- /dev/null +++ b/package/webkitgtk/0001-WTF-Failure-to-build-when-the-compiler-specifically-.patch @@ -0,0 +1,36 @@ +From 09d5520d910b63fba67bea1d8c71f5d426f345b7 Mon Sep 17 00:00:00 2001 +From: "aperez@igalia.com" + <aperez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> +Date: Wed, 12 Jul 2017 18:42:29 +0000 +Subject: [PATCH] [WTF] Failure to build when the compiler specifically targets + ARMv8-A / defines __ARM_ARCH_8A__ + https://bugs.webkit.org/show_bug.cgi?id=174425 + +Reviewed by Michael Catanzaro. + +* wtf/Platform.h: Also check for __ARCH_ARM_8A__ to detect ARMv8. + +Signed-off-by: Adrian Perez de Castro <aperez@igalia.com> + +git-svn-id: http://svn.webkit.org/repository/webkit/trunk@219415 268f45cc-cd09-0410-ab3c-d52691b4dbfc +--- + Source/WTF/wtf/Platform.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h +index 44d929c333c..7dccb44fcbf 100644 +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -238,7 +238,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 */ +-- +2.13.3 + diff --git a/package/webkitgtk/0002-bmalloc-Failure-to-build-when-the-compiler-specifica.patch b/package/webkitgtk/0002-bmalloc-Failure-to-build-when-the-compiler-specifica.patch new file mode 100644 index 0000000000..e1623bffa0 --- /dev/null +++ b/package/webkitgtk/0002-bmalloc-Failure-to-build-when-the-compiler-specifica.patch @@ -0,0 +1,36 @@ +From 07dab7fe552c53e7840e34d3c8bb1cc43a921706 Mon Sep 17 00:00:00 2001 +From: "aperez@igalia.com" + <aperez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> +Date: Wed, 12 Jul 2017 18:43:36 +0000 +Subject: [PATCH] bmalloc: Failure to build when the compiler specifically + targets ARMv8-A / defines __ARM_ARCH_8A__ + https://bugs.webkit.org/show_bug.cgi?id=174424 + +Reviewed by Michael Catanzaro. + +* bmalloc/BPlatform.h: Also check for __ARCH_ARM_8A__ to detect ARMv8. + +Signed-off-by: Adrian Perez de Castro <aperez@igalia.com> + +git-svn-id: http://svn.webkit.org/repository/webkit/trunk@219416 268f45cc-cd09-0410-ab3c-d52691b4dbfc +--- + Source/bmalloc/bmalloc/BPlatform.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Source/bmalloc/bmalloc/BPlatform.h b/Source/bmalloc/bmalloc/BPlatform.h +index 8d768db63fb..400143a63fb 100644 +--- a/Source/bmalloc/bmalloc/BPlatform.h ++++ b/Source/bmalloc/bmalloc/BPlatform.h +@@ -120,7 +120,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 */ +-- +2.13.3 +
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> --- Changes v2 -> v3: - Remove hunks for ChangeLog edits, which are not present in releases. Changes v1 -> v2: - Format upstream patches with "git format-patch -N" --- ...-to-build-when-the-compiler-specifically-.patch | 36 ++++++++++++++++++++++ ...lure-to-build-when-the-compiler-specifica.patch | 36 ++++++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 package/webkitgtk/0001-WTF-Failure-to-build-when-the-compiler-specifically-.patch create mode 100644 package/webkitgtk/0002-bmalloc-Failure-to-build-when-the-compiler-specifica.patch