From patchwork Thu May 18 05:34:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 100044 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp560352qge; Wed, 17 May 2017 22:34:52 -0700 (PDT) X-Received: by 10.99.111.140 with SMTP id k134mr2517552pgc.20.1495085692439; Wed, 17 May 2017 22:34:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495085692; cv=none; d=google.com; s=arc-20160816; b=KENsTc3wgjg/zJdw1MYBxaP/UtYQ0fDGcZDL2tE3JHWM7etbAhb8dQu1oJvg7FImPD t0T3BEUZGlQu6aY/XknUHJEcVaIHyWEaoGIO8ijD+LkG/nfsfIq0WUUfgjDH5MRr1AFE XPtNnmy/+xdLTh279lqOO1s0HIXEsrZ3a/eXRvJdfNuS48Wb6HEIachSdiN7L3x/CnEJ hJytanhiQIsLDC3d74u0LnNBu6iCYkNGQLjig7EJtdRvx8zEjlgAJ+chWIYNy6i78Aad Oif3p7sBq87hfKVXCShoT++aavB2gqk2pLUKrqOUvufa4hALRMpyNITPcUROIgCNekVk Y4yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=Lcx8QD7m68NCGmBARBJHxFG+9itJbhnftxw1RlAE37Y=; b=xyS63TMIUDpC07bWZJ0W+EX/u2OKokjnuKYMf8zhyKUXJQ+Bdk/PcAiw74w9L4ROiC 1yawAxqeqfjECak+wChjQsZpUFxVgKUySc26uJu+ivoj8BaVYSk4Z7+mwuBG51pUboQF 0xCT8+y15v4gSP54zoqkwTf6D/GH4NOwJthnLvcScoOEJt9C7XgzaWeYGhAo0eYQANb3 uMj/vWYh3jHbEDknjOrr+mo7WvlhPA9yVUepvTEvMkY4kf96BhVoRhioeIhwkvazpVwe XZe6icPRiJ2eWooeYE7R4iowUX65TLZdFZWhayJ8pZkULCYjcAzqZ+H1O+j6k4ewZ0s7 z81Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id i128si4276953pgc.135.2017.05.17.22.34.52; Wed, 17 May 2017 22:34:52 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id BAF8F60616; Thu, 18 May 2017 05:34:40 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by mail.openembedded.org (Postfix) with ESMTP id 3361160616 for ; Thu, 18 May 2017 05:34:37 +0000 (UTC) Received: by mail-pg0-f68.google.com with SMTP id s62so4582807pgc.0 for ; Wed, 17 May 2017 22:34:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=qMYUpjNCUfQ4p/IC5iayFK4p6cQnmaLu5MxBp8ieVuw=; b=qfFxJgfCIA+eWX8AHotCRffqqcLv2HABhvesW31puwOO89fnX5HSalaOuOvsZAPKGh UvUOJTn8PqrdWDwH9JBsYCrYBeBZlQOKXPF9jKD2H0Kc6/lZinRTWEJpnSqKFl89Tk1T ab+dtSw4pmujgfogIjuZNKDLTcqWfrvQ9yrwvu8jm/yYQjSvqgZLQlYds5S3b/aCQtpB M+56CvxQ7yf++ArMhyXJXadViI0YH4Dd8w+ZACcGc0Mo12LyG5gcM/d0O2NqBx4Ex4rP WWBkdlN50+Gmh7tgn1lGn2s1LEDZ0gqm/9P/+bdqOXavnmag5sFGr5uJvnjWDskNJvyJ KRQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=qMYUpjNCUfQ4p/IC5iayFK4p6cQnmaLu5MxBp8ieVuw=; b=WSenGKkDmzMkfsVynLhpMc/FtNxCVfa84QdjNZ1qnNjG+FDUJ45cwh7TmuqAMVjrIY k+tqi2RQYGtpLpLX1btY5Fwjc+bVQp+1vbgOp15AFbtC22a7wFqgZ9//wrJebAgHG3RQ be9BR43KfVy8T5WVZyJ/AvEkjUccEK+Z85Z6MrFkiL0IJYsL92N86dOLueCqESP+9RTD tFOBxccrnRCGO2DkBWID2RCvIlhJaDcccnXV6VE3vOpAbCsOFroqI/YotiiwnfPLCkrk 8sR4tnEvNVleM4ZYgUSJV+8T1z4253AMrlVXxMk6hw5j13SsH31bFROOnzn9Tc2R61/O YUdQ== X-Gm-Message-State: AODbwcActOSiiLuXE6YwIQlEUwgSqcm1PSfH/no+nQLn8bJYnAXzU3uX lzziPyZYGXal3Q== X-Received: by 10.98.35.142 with SMTP id q14mr2501792pfj.220.1495085678990; Wed, 17 May 2017 22:34:38 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::c232]) by smtp.gmail.com with ESMTPSA id d83sm6802286pfe.40.2017.05.17.22.34.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 May 2017 22:34:37 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Wed, 17 May 2017 22:34:24 -0700 Message-Id: <20170518053425.37319-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.0 Subject: [OE-core] [PATCH 1/2] webkitgtk: Fix build for armv5 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Detect atomics during configure Signed-off-by: Khem Raj --- .../detect-atomics-during-configure.patch | 34 ++++++++++++++++++++++ meta/recipes-sato/webkit/webkitgtk_2.16.1.bb | 1 + 2 files changed, 35 insertions(+) create mode 100644 meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch -- 2.13.0 -- _______________________________________________ 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/detect-atomics-during-configure.patch b/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch new file mode 100644 index 0000000000..12836f28f2 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch @@ -0,0 +1,34 @@ +Taken from +https://bugs.webkit.org/show_bug.cgi?id=161900 + +Upstream-Status: Pending +Signed-off-by: Khem Raj + +Index: webkitgtk-2.16.1/Source/WTF/wtf/CMakeLists.txt +=================================================================== +--- webkitgtk-2.16.1.orig/Source/WTF/wtf/CMakeLists.txt ++++ webkitgtk-2.16.1/Source/WTF/wtf/CMakeLists.txt +@@ -182,7 +182,6 @@ set(WTF_HEADERS + + set(WTF_SOURCES + Assertions.cpp +- Atomics.cpp + AutomaticThread.cpp + BitVector.cpp + ClockType.cpp +@@ -301,6 +300,15 @@ if (NOT USE_SYSTEM_MALLOC) + list(APPEND WTF_LIBRARIES bmalloc) + endif () + ++file(WRITE ${CMAKE_BINARY_DIR}/test_atomics.cpp ++ "int main(void)\n" ++ "{ long long x = 1; return (int) __sync_add_and_fetch_8(&x, 1); }\n") ++try_compile(ATOMICS_BUILD_SUCCEEDED ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/test_atomics.cpp) ++if (NOT ATOMICS_BUILD_SUCCEEDED) ++ list(APPEND WTF_SOURCES Atomics.cpp) ++endif () ++file(REMOVE ${CMAKE_BINARY_DIR}/test_atomics.cpp) ++ + list(APPEND WTF_SOURCES + unicode/icu/CollatorICU.cpp + ) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.16.1.bb b/meta/recipes-sato/webkit/webkitgtk_2.16.1.bb index 0931a50636..a52d93cfbe 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.16.1.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.16.1.bb @@ -20,6 +20,7 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://x32_support.patch \ file://cross-compile.patch \ file://gcc7.patch \ + file://detect-atomics-during-configure.patch \ " SRC_URI[md5sum] = "d3bcf995a667fd9febb9ab991acf0ca7" SRC_URI[sha256sum] = "eb92383232328ce655b703c64370ed3795662479719ad1b4a869ed46769d2945"