| Message ID | 20180520220442.16092-2-raj.khem@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/2] acpica: Upgrade to 20180508 release | expand |
2018-05-21 1:04 GMT+03:00 Khem Raj <raj.khem@gmail.com>: > +Subject: [PATCH] soup: Forward declare URL class > + > +This helps getting away with compiler errors seen with clang > + > +/mnt/a/oe/workspace/sources/webkitgtk/Source/WebCore/platform/network/soup/SoupNetworkSession.h:68:62: > +error: unknown type name 'URL' > + static std::optional<ResourceError> checkTLSErrors(const URL&, > +GTlsCertificate*, GTlsCertificateFlags); Thanks - gcc has the same issue. I'm not sure how upstream is able to build. > -EXTRA_OECMAKE_append_toolchain-clang = " -DUSE_LD_GOLD=OFF " > +#EXTRA_OECMAKE_append_toolchain-clang = " -DUSE_LD_GOLD=OFF " This needs a comment or should be removed altogether. Alex -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
On 21 May 2018 at 07:07, Alexander Kanavin <alex.kanavin@gmail.com> wrote: > 2018-05-21 1:04 GMT+03:00 Khem Raj <raj.khem@gmail.com>: >> +Subject: [PATCH] soup: Forward declare URL class >> + >> +This helps getting away with compiler errors seen with clang >> + >> +/mnt/a/oe/workspace/sources/webkitgtk/Source/WebCore/platform/network/soup/SoupNetworkSession.h:68:62: >> +error: unknown type name 'URL' >> + static std::optional<ResourceError> checkTLSErrors(const URL&, >> +GTlsCertificate*, GTlsCertificateFlags); > > Thanks - gcc has the same issue. I'm not sure how upstream is able to build. https://trac.webkit.org/changeset/231876/webkit Ross -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
On Mon, May 21, 2018 at 3:14 AM, Burton, Ross <ross.burton@intel.com> wrote: > On 21 May 2018 at 07:07, Alexander Kanavin <alex.kanavin@gmail.com> wrote: >> 2018-05-21 1:04 GMT+03:00 Khem Raj <raj.khem@gmail.com>: >>> +Subject: [PATCH] soup: Forward declare URL class >>> + >>> +This helps getting away with compiler errors seen with clang >>> + >>> +/mnt/a/oe/workspace/sources/webkitgtk/Source/WebCore/platform/network/soup/SoupNetworkSession.h:68:62: >>> +error: unknown type name 'URL' >>> + static std::optional<ResourceError> checkTLSErrors(const URL&, >>> +GTlsCertificate*, GTlsCertificateFlags); >> >> Thanks - gcc has the same issue. I'm not sure how upstream is able to build. > > https://trac.webkit.org/changeset/231876/webkit yes its fixed in master Carlos informed me offline > > Ross -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
diff --git a/meta/recipes-sato/webkit/webkitgtk/0012-soup-Forward-declare-URL-class.patch b/meta/recipes-sato/webkit/webkitgtk/0012-soup-Forward-declare-URL-class.patch new file mode 100644 index 0000000000..c689117650 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/0012-soup-Forward-declare-URL-class.patch @@ -0,0 +1,31 @@ +From 59f6903ad96f3213f248b672d5fd526cc0d666ce Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 20 May 2018 14:28:27 -0700 +Subject: [PATCH] soup: Forward declare URL class + +This helps getting away with compiler errors seen with clang + +/mnt/a/oe/workspace/sources/webkitgtk/Source/WebCore/platform/network/soup/SoupNetworkSession.h:68:62: +error: unknown type name 'URL' + static std::optional<ResourceError> checkTLSErrors(const URL&, +GTlsCertificate*, GTlsCertificateFlags); + ^ +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Source/WebCore/platform/network/soup/SoupNetworkSession.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Source/WebCore/platform/network/soup/SoupNetworkSession.h b/Source/WebCore/platform/network/soup/SoupNetworkSession.h +index 03bd72ba..7ca8792d 100644 +--- a/Source/WebCore/platform/network/soup/SoupNetworkSession.h ++++ b/Source/WebCore/platform/network/soup/SoupNetworkSession.h +@@ -43,6 +43,7 @@ namespace WebCore { + + class CertificateInfo; + class ResourceError; ++class URL; + struct SoupNetworkProxySettings; + + class SoupNetworkSession { diff --git a/meta/recipes-sato/webkit/webkitgtk_2.20.1.bb b/meta/recipes-sato/webkit/webkitgtk_2.20.2.bb similarity index 95% rename from meta/recipes-sato/webkit/webkitgtk_2.20.1.bb rename to meta/recipes-sato/webkit/webkitgtk_2.20.2.bb index 360ab8e69b..a3d62e7ba7 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.20.1.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.20.2.bb @@ -21,10 +21,11 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \ file://0001-Fix-build-with-musl.patch \ file://detect-gstreamer-gl.patch \ + file://0012-soup-Forward-declare-URL-class.patch \ " -SRC_URI[md5sum] = "0cd9b9ae1f48c04de5314f77806eceb4" -SRC_URI[sha256sum] = "43e43285fa4e393080cc4fbd5ad8644749a75b1e0b811b230b63ae56806c8959" +SRC_URI[md5sum] = "3fdda40dc10eb2a00d5fba4219b83967" +SRC_URI[sha256sum] = "dffe93a241f03f1c73b369f4e323e4d8f12e39d33d5515948cbf454ca4b526e2" inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc @@ -85,7 +86,7 @@ EXTRA_OECMAKE_append_armv4 = " -DENABLE_JIT=OFF " EXTRA_OECMAKE_append_aarch64 = " -DUSE_LD_GOLD=OFF " EXTRA_OECMAKE_append_mipsarch = " -DUSE_LD_GOLD=OFF " EXTRA_OECMAKE_append_powerpc = " -DUSE_LD_GOLD=OFF " -EXTRA_OECMAKE_append_toolchain-clang = " -DUSE_LD_GOLD=OFF " +#EXTRA_OECMAKE_append_toolchain-clang = " -DUSE_LD_GOLD=OFF " EXTRA_OECMAKE_append_aarch64 = " -DWTF_CPU_ARM64_CORTEXA53=ON"
Patch it to build with clang Signed-off-by: Khem Raj <raj.khem@gmail.com> --- .../0012-soup-Forward-declare-URL-class.patch | 31 +++++++++++++++++++ ...ebkitgtk_2.20.1.bb => webkitgtk_2.20.2.bb} | 7 +++-- 2 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-sato/webkit/webkitgtk/0012-soup-Forward-declare-URL-class.patch rename meta/recipes-sato/webkit/{webkitgtk_2.20.1.bb => webkitgtk_2.20.2.bb} (95%) -- 2.17.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core