From patchwork Thu Jan 31 06:50:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 157125 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp6849082jaa; Wed, 30 Jan 2019 22:50:40 -0800 (PST) X-Google-Smtp-Source: ALg8bN6N+q4ZuE4VHcVaq8SKzL5b221UQ9qP+DScvZhBanuPNfk8yLj93tIdpl1mCOBTPd5LSBrl X-Received: by 2002:a17:902:6948:: with SMTP id k8mr33045469plt.2.1548917440827; Wed, 30 Jan 2019 22:50:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548917440; cv=none; d=google.com; s=arc-20160816; b=wcproZR451sP6K6RLip7dLQ1Pig0MPlMcay7s/h9vZKSb+cSs4rwAa2OA33ADrxKm4 0Wt4IBI/OoQdldxxFl7zYStu8qmoIeIcjsLjJGEb5W2m7LEZpeBTKehvorwcDq/2Ik9I Eopw0REkltHWQ5rEbhxiKsFvmMH64n3JLH6WeWu3Nrvb/JPVRfwLniwlswEfs24B10Dn liLCeEEfTqqTSUmFnrnxguR65rPpuhvFqElMbiEFl8G8jQquAT9/l9vZPm+wpopmG7Im 1/BcPnB0z6XoKy9g/JrJcayP/G8oc8fjlYE32w/4b2WcRLnCxWL1oU93GcHSQbF6SesZ kT9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:delivered-to; bh=OB19q5zLMbv4fAZA3jrwejIduUyLx5myZ7ZP6dhphSg=; b=JPT4rui3WJd6bagQIR8Tn4jsphZZlu04ulaspiXz+sY/vzV20oTrqSKjRPap5CREZv vAMw359cF+M/bxgMcwyiqnqPFAj42pNwJyszsCaugW8eZpbQ8uCGKVLg4eLbXEBJJUx3 COyxKPFtDObYFxgXDUZNPRWat2CwMo9LNnRgDkhP4qFBfLPpbLZFlqJ8ssRHuS13YX3Q fpBeoouhtO+V7FpitRnRNu0AN+KazWeXPo8ppgUjgDf4lIzhnfnYI75a0bW7flQrLH4V XWwp4v7YFnrPB75gNhu9l3sObEBnLNhKDneOUEOgblLIkGDGtGEQk37kK1KFPPwkkPJX m/vA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=aPAv81ie; 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=QUARANTINE 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 t19si3377644pgu.5.2019.01.30.22.50.40; Wed, 30 Jan 2019 22:50:40 -0800 (PST) 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 header.s=20161025 header.b=aPAv81ie; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from 165.28.230.35.bc.googleusercontent.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 0B8DE7C3D3; Thu, 31 Jan 2019 06:50:37 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by mail.openembedded.org (Postfix) with ESMTP id B804760110 for ; Thu, 31 Jan 2019 06:50:35 +0000 (UTC) Received: by mail-pf1-f194.google.com with SMTP id u6so1040138pfh.11 for ; Wed, 30 Jan 2019 22:50:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=cXchmvoXWQnauujIjWiFafc9oRDTWp9CXSc2tmpcqXA=; b=aPAv81iee1zwi/k2WnEfF45OSIH3MwWKeZU63+NfCRLl+1qI2Zl1HJMgAdDSYo6iku Pjlu25i0IvlVl/Uu2ZIXqwV4MBTbOCYrLi61sbTvBiLXOlFppAUOAwR4HFCgryG0lYQl MTCvAtUK9NFe3Em2DETrYTffEgFYlsSdMbU4Y3Qo0qk5oK73khqW2E7nLh1cBy6v9DEa 7hk0rTTDmasvJwtfX+NOtbXQvcbQWPx8nPkVX/ZHZw1jRpIZ9KEUlpxl7lruHtEPm3m7 RwDnvrs2uqYs3IR9snceAWnVC5r1sVzKnTOlgZOiPYlgLf/i4TIYYBKcaBx2YbiP48V4 6Ecw== 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:mime-version :content-transfer-encoding; bh=cXchmvoXWQnauujIjWiFafc9oRDTWp9CXSc2tmpcqXA=; b=TYnJC6uec9ieBQF3JKPa7CngK3LmKgBvhlr7dfqT8R90Umtk2guhhFK1Huq6Xm/wIH E+TsgsW06S9llp+SuY13OpPElovmBiwQbGGrD8ytIP8iBef9CdHN1fChT9r2PkCXOC7N ugj+BFQYglKJfPytApLHuxhxEXf2fCu2yc3NcEoyznSjPDy6fS0LSj5Gd4ZvQ/jdrRz1 fCmPiTL0X6uTcE8i3D+0y7MvZe1I2jkPRWDTrA8pQnqWgn0q+iYfmR7DAJy5BXw2ykqP /6+yjSUKrrKc9IPZgnZa0onfxExfK+HqT9b4NrmRvFw2asubTqOF3Ilf+Y+mHvTdJBr/ 4kRQ== X-Gm-Message-State: AJcUukeKPrqCGvQ3KrbaPo03nnnIq8F2+yt6AQDO03PbBzZBCsCwYFAG /vaimD3nYgpKvxM0RJq/hixEq/B+ X-Received: by 2002:a63:7c41:: with SMTP id l1mr29978011pgn.45.1548917436295; Wed, 30 Jan 2019 22:50:36 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:8500:6bc6::26b6]) by smtp.gmail.com with ESMTPSA id o85sm1080044pfi.105.2019.01.30.22.50.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Jan 2019 22:50:35 -0800 (PST) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Wed, 30 Jan 2019 22:50:11 -0800 Message-Id: <20190131065016.21887-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [OE-core] [PATCH 1/6] mpeg2dec: Fix global symbol tests 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: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Rewrite the public symbol check to verify the shared libraries, to check for more things, and to avoid duplication; fixes make check on ARM Signed-off-by: Khem Raj --- .../files/61_global-symbol-test.patch | 70 +++++++++++++++++++ .../mpeg2dec/mpeg2dec_0.5.1.bb | 1 + 2 files changed, 71 insertions(+) create mode 100644 meta/recipes-multimedia/mpeg2dec/files/61_global-symbol-test.patch -- 2.20.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-multimedia/mpeg2dec/files/61_global-symbol-test.patch b/meta/recipes-multimedia/mpeg2dec/files/61_global-symbol-test.patch new file mode 100644 index 0000000000..00b667d336 --- /dev/null +++ b/meta/recipes-multimedia/mpeg2dec/files/61_global-symbol-test.patch @@ -0,0 +1,70 @@ +Rewrite the public symbol check to verify the shared libraries, to check for +more things, and to avoid duplication; fixes make check on ARM + +Taken From +https://sources.debian.org/src/mpeg2dec/0.5.1-8/debian/patches/61_global-symbol-test.patch/ + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + test/globals | 42 +++++++++++++++++++++++++++--------------- + 1 file changed, 27 insertions(+), 15 deletions(-) + +--- mpeg2dec.orig/test/globals ++++ mpeg2dec/test/globals +@@ -1,4 +1,8 @@ + #!/bin/sh ++# TODO ++# - fix checking of .a libs; problem is that "nm -g --defined-only" lists ++# internal symbols; this can be solved by using objdump, but it's probably ++# good enough to just run the tests on the shared lib + + if test x"$srcdir" != x""; then + builddir="." # running from make check, but it does not define that +@@ -14,22 +18,30 @@ builddir=`cd $builddir;pwd` + + error=0 + +-bad_globals=`nm -g --defined-only $builddir/../libmpeg2/*.o |\ +- awk '{if ($3) print $3}' | grep -v '^_\?mpeg2_'` +- +-if test x"$bad_globals" != x""; then +- echo BAD GLOBAL SYMBOLS: +- for s in $bad_globals; do echo $s; done ++# check_bad_public_symbols [...] ++# ++# checks public symbols in shared libs: ++# - allow prefix_anything ++# - reject _prefixanything ++# - allow _anything ++# - reject anything else ++# ++# NB: skips missing files ++check_bad_public_symbols() { ++ symbols_prefix="$1" ++ shift ++ lib_files=`ls "$@" 2>/dev/null` ++ [ -z "$lib_files" ] && return ++ bad_globals=`nm -g --defined-only $lib_files | ++ awk '{if ($3) print $3}' | ++ sed -n "/^${symbols_prefix}_/ d; /^_${symbols_prefix}/ { p; d }; /^_/ d; p"` ++ [ -z "$bad_globals" ] && return + error=1 +-fi +- +-bad_globals=`nm -g --defined-only $builddir/../libmpeg2/convert/*.o |\ +- awk '{if ($3) print $3}' | grep -v '^_\?mpeg2convert_'` ++ echo BAD GLOBAL SYMBOLS in $lib_files: ++ echo "$bad_globals" ++} + +-if test x"$bad_globals" != x""; then +- echo BAD GLOBAL SYMBOLS: +- for s in $bad_globals; do echo $s; done +- error=1 +-fi ++check_bad_public_symbols mpeg2 $builddir/../libmpeg2/.libs/libmpeg2.so ++check_bad_public_symbols mpeg2convert $builddir/../libmpeg2/convert/.libs/libmpeg2convert.so + + exit $error diff --git a/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.5.1.bb b/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.5.1.bb index 7711c2dc10..6b59d4f681 100644 --- a/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.5.1.bb +++ b/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.5.1.bb @@ -10,6 +10,7 @@ SRC_URI = "http://libmpeg2.sourceforge.net/files/libmpeg2-${PV}.tar.gz \ file://altivec_h_needed.patch \ file://0001-check-for-available-arm-optimizations.patch \ file://0002-Set-visibility-of-global-symbols-used-in-ARM-specifi.patch \ + file://61_global-symbol-test.patch \ " S = "${WORKDIR}/libmpeg2-${PV}" From patchwork Thu Jan 31 06:50:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 157126 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp6849300jaa; Wed, 30 Jan 2019 22:51:00 -0800 (PST) X-Google-Smtp-Source: ALg8bN5JXpFpQ/eo0o7iJmGLyGemM7S7YHWCm7kLgkwhozDITs/0SkQuLFhcRmj4dmqGYdC7gKSA X-Received: by 2002:a17:902:887:: with SMTP id 7mr33386339pll.164.1548917460196; Wed, 30 Jan 2019 22:51:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548917460; cv=none; d=google.com; s=arc-20160816; b=raA7C7XafU3izkmMGV4VNF77znu8vQ0AzNaSBa7v36hP+IqgUE/udgu8H9W1miAQV1 TH7JxkX3enV70oL4PkZktd3rXZZOczD+8r+Mq8CkIWG3WcyQMIbeUj3cpd20xjoJALbU HkfW+UMMjOB3w9cXJm45nxEhq3KfWXCambAc6ww36pc79C7l12eFz/1LWSkBfa1Q9DD0 4cEdOWxGrgJuqiahrLX+mgTnfQlIv2RFExYePt4F5cjS2I7CkBKaSQo16SgsxUWDxurJ AVCKKmUkB83woCAltuUMcYXugqDK+lrNjrQwi23/BVvkM9Vn+KbDoNmhwrORnMkbSETW TrLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=EWiA0lWh0aR7agoYydlHck3QrxkqLX0Xwz/ejtBD28Q=; b=PXsuZs7+A9T15YfsthU66JW34tJjpF2Vwyia0Ae4cADh060oo9BFqKqKqNaPw2w6oK XyZsRtCp1mil/JyZbLIFoSfW9eXv1K/q1Qv3uzDFwyCLTBWNRCiXS4MQjMD2pOJE+rWJ nuUmFlG7yD7quJl9HgFhut/OYm1TG4f10x5KzXwC5DnTgm6PfAUy6zmIHsQzORFHJfWE WE5kyQWd5rKsY6y7iJcNPhbaQP1MvnChuVfszdy1Hx7pQXzR/TT636emKW/acvSxk0SE 6diEGSVYgk8/RGN5c0qXDy1MlPzZKcwNhZXEAwpEI/JzW9lsh4eiZ4Kjf53IR3gbrZUC 6X7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=k2ZdBOGt; 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=QUARANTINE 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 p186si3561577pgp.37.2019.01.30.22.50.59; Wed, 30 Jan 2019 22:51:00 -0800 (PST) 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 header.s=20161025 header.b=k2ZdBOGt; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from 165.28.230.35.bc.googleusercontent.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 898F07C3E4; Thu, 31 Jan 2019 06:50:57 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by mail.openembedded.org (Postfix) with ESMTP id B86A960110 for ; Thu, 31 Jan 2019 06:50:36 +0000 (UTC) Received: by mail-pg1-f169.google.com with SMTP id v28so956995pgk.10 for ; Wed, 30 Jan 2019 22:50:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=b9Ux8I34oHe8csJLuZpYP9bDTAhps8VY5lQA+sNtKJ0=; b=k2ZdBOGtyLzR17ASb3yZSnLLkA6rVqF8ufPhCpv5nR4aL5OjdaUZ4s0JQTJrOy744l jCz66wwdcinag8e4SPoNvzTbxELB04L2L2yhf0h21WIwqlDOcYOy5dbANUF4iz0FaMsM Y90uxIEzPlsiFOGP5pCU/wU8pdbrDJkmacbzCezgJa/0hmhv3hAok31kNoV2R7Flrt/+ JeeG+voTtsEoBOWNfbba5OhNqons4MaEUFaixT2KvHP95zyPUc3QEPwppfquXzlA91/P nh/Xf6vYDFXbqqDhFnOO1HUu88xf3P+GPBZFyhn++YpUshfZWvYhHMYn+yagGK6E6RSL YxTQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=b9Ux8I34oHe8csJLuZpYP9bDTAhps8VY5lQA+sNtKJ0=; b=rI7i7F56/fOkGsi803wAYFJ13hCPkqUoA+Scdjnf+u2AfRdKaM6CeGaDnk0dklZM15 j0WGJ3sBncsTsMtpdtQ9ykfcwat4dL+MzNzCGRuUR8L9VTLe+GWLKpLT7gMAdwPjc9je ahXujzUMB93kw8Py7Dyg0b1SCaCOt2Zdjrh6982V8RFPOw0DndHwCZbCoRhRFnKtSY3z pIZod92kiDHxZE5HH2HEt96KxOknCSRbpnyBLEoV/JaE0hLcZVcCP0OPt4TI9RdhcF0A ratS+GTOs6JGdoziz2YPTykWTyzMgxOb8Rv+jg/aC43l3sw1aXO/uVIqUMKVNBlPml23 u2Jw== X-Gm-Message-State: AJcUukfDzTEYGtxy/EfzWOcDXnyQvtcifZB1nG7FTRBERgytwZBy90Ah tbVPrEAkFBPaUOL89E8vQgeUJF2O X-Received: by 2002:a65:534b:: with SMTP id w11mr30699246pgr.125.1548917437020; Wed, 30 Jan 2019 22:50:37 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:8500:6bc6::26b6]) by smtp.gmail.com with ESMTPSA id o85sm1080044pfi.105.2019.01.30.22.50.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Jan 2019 22:50:36 -0800 (PST) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Wed, 30 Jan 2019 22:50:12 -0800 Message-Id: <20190131065016.21887-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131065016.21887-1-raj.khem@gmail.com> References: <20190131065016.21887-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [OE-core] [PATCH 2/6] xinput-calibrator: Fix build with clang/libc++ 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: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- ....hh-Include-string-to-get-std-string.patch | 28 +++++++++++++++++++ .../xinput-calibrator_git.bb | 4 ++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/xinput-calibrator/xinput-calibrator/0001-calibrator.hh-Include-string-to-get-std-string.patch -- 2.20.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/0001-calibrator.hh-Include-string-to-get-std-string.patch b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/0001-calibrator.hh-Include-string-to-get-std-string.patch new file mode 100644 index 0000000000..37617600d5 --- /dev/null +++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/0001-calibrator.hh-Include-string-to-get-std-string.patch @@ -0,0 +1,28 @@ +From 79bc507b48d4acd3dec8a85ab6b341b872d44a05 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 29 Jan 2019 22:40:24 -0800 +Subject: [PATCH] calibrator.hh: Include to get std::string + +Found with libc++ + +Upstream-Status: Submitted [https://github.com/tias/xinput_calibrator/pull/76] +Signed-off-by: Khem Raj +--- + src/calibrator.hh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/calibrator.hh b/src/calibrator.hh +index a6f9504..e75bcef 100644 +--- a/src/calibrator.hh ++++ b/src/calibrator.hh +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + // XXX: we currently don't handle lines that are longer than this + #define MAX_LINE_LEN 1024 +-- +2.20.1 + diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb index 68e62ea6d9..9873d3f33f 100644 --- a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb +++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb @@ -14,7 +14,9 @@ REQUIRED_DISTRO_FEATURES = "x11" SRCREV = "03dadf55109bd43d3380f040debe9f82f66f2f35" SRC_URI = "git://github.com/tias/xinput_calibrator.git \ file://30xinput_calibrate.sh \ - file://Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch" + file://Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch \ + file://0001-calibrator.hh-Include-string-to-get-std-string.patch \ + " S = "${WORKDIR}/git" From patchwork Thu Jan 31 06:50:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 157127 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp6849386jaa; Wed, 30 Jan 2019 22:51:06 -0800 (PST) X-Google-Smtp-Source: ALg8bN403rOfRwVsnA2QWGLCbR7hAEDcdBZ9UoECVdXy39jzzeMpbirpLv6vCUTh1WcJDufZAOAn X-Received: by 2002:a62:3811:: with SMTP id f17mr34302741pfa.206.1548917466165; Wed, 30 Jan 2019 22:51:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548917466; cv=none; d=google.com; s=arc-20160816; b=mMLYKKnk4MBgcFM95cCY5cY4FZT5LyWEQRDB7jYFUXpXAqxvms1ODBkTDzRZiRU8JZ AEBCNIvNc4AlAlJC6Bvq5c15J+7wTMJtvgyRVd+716suHBLcxR2S2Bmzlq8GYTt/HF3A uPzF5FU7smuM8BwkW9taU4lxxlLIHJ+7rjLDepvYsh/g4hGGOJTGgO/HgqxrUWTadvVt oM2YgqJB+dLn2lVbftT1X+TB5vwlWIT3hAuuV37IZXBV9Wkvkpz/XI69AtP7uu3Tn5wg ENSewnoAIvfZvqDn7xRuKQrXcr1Ay4+qWvi7DYzwfxa/9se7u8lD+/TVLVmwv/6WxnRa 6CXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=F9xteIq/X2n9mD6DpBwkktMU2DNn75NLtJx5vvJIcp4=; b=hg/CkpvFuaYKSHuDNOa3ldFcHlCSDHO/jOT9NwmubHmhJtFG+opffk/+v397PyPv// JbpUDwllfqKNfVMoC3PN9ZPg0vBy5YqMYgat+Gpvqzh7ULmrBmlk9n1m3uM8Vj646O8V +rfOSTMpOuDXDbiLrs9vwRh15eFrK4EKw6grTinWz2ToNiIEUL0/L0ENvpaFQe1Nm0Mj phQuxfpmaMgLTAJbcY5vGGxXdtUeuxPRsQyvreML+qx7EHnppqvpkVdVJ2DiFJ78zC+h qU8LB/eKnQgwpeKqlvRCUkHETvoidehJUi8hluWHdgWI2XLHiaqCazfht0N5+m7tKc4s P7Aw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=JYMGQVcQ; 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=QUARANTINE 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 b124si3600061pfg.47.2019.01.30.22.51.05; Wed, 30 Jan 2019 22:51:06 -0800 (PST) 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 header.s=20161025 header.b=JYMGQVcQ; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from 165.28.230.35.bc.googleusercontent.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 0A8477C403; Thu, 31 Jan 2019 06:50:59 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by mail.openembedded.org (Postfix) with ESMTP id 5F06F7BFAD for ; Thu, 31 Jan 2019 06:50:38 +0000 (UTC) Received: by mail-pf1-f174.google.com with SMTP id g62so1035596pfd.12 for ; Wed, 30 Jan 2019 22:50:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lBgS2otMX0+ou1WJZ8EAmJ0Dy8TV9NHfB1MJtQEm48k=; b=JYMGQVcQG6jqammKJCtKOwnWol4HywUpgpcW/jlpRsax4muvBHi81uiy0Ugm25VCWO 9D2ayGxdLw9n6FUvAREBKTgpE+DXrElrAfCeoySXiOU1mNOQzxompqGhn84Baoaex59e PgRrP047foMSJ92XvD+iQRA3sClZFH3eT0NFke30Mo/LIs+A2CAOBwSa/yvYK1GX2E/M p/FkN61BNHi7BiahSeZSeHIC7rPb5Q4fb0JfZ/MyfGNt6m0mo7zG57PAhYSbx1/hMeYE gnmjxI579h8Rf6VbwAVqhtxnRtUGWbYJrTTl4nIkpY4bfWlC//a7YKn4X8pIMISQRX4y 0UwQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=lBgS2otMX0+ou1WJZ8EAmJ0Dy8TV9NHfB1MJtQEm48k=; b=cIcaExyA9hyez6/iB4srL1EpHHz7L7RrEfKXOUi+dkO+MZq1TWtcGkleJHWBv7PHpy P3KsJCrqXS6IoJfe8+9ctjOBxthHeQY5Hd5GWpNSFYeFdFVyhJq2+ZLUqRNJCbK/Fgmh 47+atfSGXSLprlHF2YlW2xlFwU0GEE0DIqRehBb4HX4CO0QfY/F+4VtuAtf+aIgzjP5U Gq8fpGHwvp7L2L+Dgg54PcaZqGIv45smJOfLFGktjQoQbIid+RlkgArppx9NfjwzLIsc 1xtDhBd30wCZIUavomP2BnhZQ5ZDcZE9nWRIIz6ZAGRrdtfrNLAw7Z3ItzKjBmMw1efL ldVA== X-Gm-Message-State: AJcUukePGzzIf22HYw7T2LC4FFuULnwjbjjlfCmlQb+nlbzO82yw0CZb +JpEH/lX7vDAG0R1rrlMgf08EObI X-Received: by 2002:a63:a84a:: with SMTP id i10mr30886327pgp.263.1548917438565; Wed, 30 Jan 2019 22:50:38 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:8500:6bc6::26b6]) by smtp.gmail.com with ESMTPSA id o85sm1080044pfi.105.2019.01.30.22.50.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Jan 2019 22:50:37 -0800 (PST) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Wed, 30 Jan 2019 22:50:13 -0800 Message-Id: <20190131065016.21887-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131065016.21887-1-raj.khem@gmail.com> References: <20190131065016.21887-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [OE-core] [PATCH 3/6] libproxy: Fix build with clang/libc++ 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: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- ...t-pac-test-Fix-build-with-clang-libc.patch | 31 +++++++++++++++++++ .../libproxy/libproxy_0.4.15.bb | 4 ++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-support/libproxy/libproxy/0001-get-pac-test-Fix-build-with-clang-libc.patch -- 2.20.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-support/libproxy/libproxy/0001-get-pac-test-Fix-build-with-clang-libc.patch b/meta/recipes-support/libproxy/libproxy/0001-get-pac-test-Fix-build-with-clang-libc.patch new file mode 100644 index 0000000000..fedda9dd95 --- /dev/null +++ b/meta/recipes-support/libproxy/libproxy/0001-get-pac-test-Fix-build-with-clang-libc.patch @@ -0,0 +1,31 @@ +From 2d73469c7a17ebfe4330ac6643b0c8abdc125d05 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 30 Jan 2019 09:29:44 -0800 +Subject: [PATCH] get-pac-test: Fix build with clang/libc++ + +get-pac-test.cpp:55:10: error: assigning to 'int' from incompatible type '__bind' + ret = bind(m_sock, (sockaddr*)&addr, sizeof (struct sockaddr_in)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Upstream-Status: Submitted [https://github.com/libproxy/libproxy/pull/97] + +Signed-off-by: Khem Raj +--- + libproxy/test/get-pac-test.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libproxy/test/get-pac-test.cpp b/libproxy/test/get-pac-test.cpp +index 0059dfb..911f296 100644 +--- a/libproxy/test/get-pac-test.cpp ++++ b/libproxy/test/get-pac-test.cpp +@@ -52,7 +52,7 @@ class TestServer { + + setsockopt(m_sock, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i)); + +- ret = bind(m_sock, (sockaddr*)&addr, sizeof (struct sockaddr_in)); ++ ret = ::bind(m_sock, (sockaddr*)&addr, sizeof (struct sockaddr_in)); + assert(!ret); + + ret = listen(m_sock, 1); +-- +2.20.1 + diff --git a/meta/recipes-support/libproxy/libproxy_0.4.15.bb b/meta/recipes-support/libproxy/libproxy_0.4.15.bb index dd7ad922d3..19dddebd44 100644 --- a/meta/recipes-support/libproxy/libproxy_0.4.15.bb +++ b/meta/recipes-support/libproxy/libproxy_0.4.15.bb @@ -8,7 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ DEPENDS = "glib-2.0" -SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz" +SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \ + file://0001-get-pac-test-Fix-build-with-clang-libc.patch \ + " SRC_URI[md5sum] = "f6b1d2a1e17a99cd3debaae6d04ab152" SRC_URI[sha256sum] = "654db464120c9534654590b6683c7fa3887b3dad0ca1c4cd412af24fbfca6d4f" From patchwork Thu Jan 31 06:50:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 157128 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp6849492jaa; Wed, 30 Jan 2019 22:51:13 -0800 (PST) X-Google-Smtp-Source: ALg8bN6MjAQruAJCv0VLxU35uzVP2lhTBYrLW4l49oMyiY+H73BbSdHL7AfbaYTzTArE37uwPj+0 X-Received: by 2002:a63:5d20:: with SMTP id r32mr30704410pgb.329.1548917473408; Wed, 30 Jan 2019 22:51:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548917473; cv=none; d=google.com; s=arc-20160816; b=kZhqyekXAXqmAOWYaiUtSxmFaGvyIDHeIc/A7aoBQbqG+RXxaibXdDAwOAUpzT2Q6f K7OVs9vJMcaNEZlnCCnzArCvZnqYt/QVBK/5u7xszidrWGWiMU2bMc9DwAN73M8Aqz4Z sqcBxCsHc9ydLwvc13tfmtmLHGJkaENoEhC9SIeRnz34BXaUvdPz1X8BLOherjNYoCfL IFm82mY3f4M4xBJ2e9l4PUOXo4PUy5v3iMFreOxQfZ7daF0PDz+fTXq++pZEh5YXI2Gi b8hQpZyIniU+8BMsC5AoO2DxNlqgV+tjTDoRR0kfyXcCAvv33iFG6fXOvzvilcvcQRyc Bg0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=Pl8vLgtbz2S6f2VZLO52ssmTtJt9Ou2rC2RweFiN35A=; b=R+rMW/fhDMmQ3e0DHL5M51qyyikMoxNPpD184c8sqtIdF5ioihumKutznvOgItGw21 JeMgjeadqqvP1IdjhBym3Dgl3bmDWJAtFiq5Y20C/1lYhtBCCSvZxwZESWQ6qzigJVF4 qFYsfM4ojUIaWyFFO8kMygX2emMRqG9Xqa8INH/oexwwdSLHpQHwNe+xfvTjOcvu3kOV 8BDQG9n3s+JKiHV2bopZTZuVgytQplO/rjrdLmoySbwnlPl38dzzStBj8NQ99ta+Ro2u 7eAi8NE1AdYeG0mpun6JN0Lp4S4IxxybdH0G3gVy51VXr892Ygvs/gDiio48gn8na6v8 nj2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="dEw2i0b/"; 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=QUARANTINE 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 k22si3446589pgl.29.2019.01.30.22.51.13; Wed, 30 Jan 2019 22:51:13 -0800 (PST) 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 header.s=20161025 header.b="dEw2i0b/"; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from 165.28.230.35.bc.googleusercontent.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 56ADE7C416; Thu, 31 Jan 2019 06:51:00 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by mail.openembedded.org (Postfix) with ESMTP id 0372D7C3DE for ; Thu, 31 Jan 2019 06:50:38 +0000 (UTC) Received: by mail-pg1-f170.google.com with SMTP id s198so977866pgs.2 for ; Wed, 30 Jan 2019 22:50:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UBjkhw/BQMDfZefHbyB46nQizywFtiMVBLC/TKTzmrE=; b=dEw2i0b/YIAxeYRMUc1zfiCsrj7M6Y0p4KKJpv4WcTCeQsJn+i9MJMONFk3Iv1UXJ0 CVpGPezZI/6/hssdiMC5OfQ+tZHIJnw7vlePAAfK93HRh8WJsAA6GWVbsBjhkDqQc8eH l9287Ps66w30xyCaAw8SawPDdfC9QIr0phUiRd1O9g1qjAot4D1hICAVL9qXnkoEA917 gDFVo2Jh+Lh3JM/NfeVFKBScFcSBOyEnXzQmhCby/qXj7aZAUdD5BS/PPw8Wv14RnYdv aasGP3b7GGp+yGgMljAGzw8nbPYEePgjP5mos+F/NCmQEcfma0VH2zHbWF9JhAuN66Nz Hb4A== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=UBjkhw/BQMDfZefHbyB46nQizywFtiMVBLC/TKTzmrE=; b=RFGDpvsARzOo1jV8RWYmhp001GK1RwzuPfE8mfrcsh4jhPY64+elXodeynlSW/fXhR fTu30f/Ez7ECdB3AJ8zmOVDD5Cl2czuUjvfcExQj4WAJ8KdMwKLR/ABAJ9+bb+TQKGHP tkh7pwtq0xVGkmAGoRtd9KAt7e8hJPDg4T371yuizH059Fh2wfKMZ55WNfeH0W0NFT71 MBb93uxEUGE4uzek1pJyRW5ZyCUqY/1nudmSQ0hnFZH2kq+I9mRGeReUR3gSVM79BXKw pFbvfQ4E5eGSa+GWoU3zp9TSjqmpTDOui1rzrR/clCkSvlLOlpCluyB3YYMc1uXnANqe Ra3Q== X-Gm-Message-State: AJcUukegc7W6vUETrLLC99KYWs15I+1ysUX/2+bHQkk3izyn9tpjItAZ ATQhlcJZ54/WB9Q2fErPb9UnwW16 X-Received: by 2002:a63:4f20:: with SMTP id d32mr30280736pgb.47.1548917439548; Wed, 30 Jan 2019 22:50:39 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:8500:6bc6::26b6]) by smtp.gmail.com with ESMTPSA id o85sm1080044pfi.105.2019.01.30.22.50.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Jan 2019 22:50:38 -0800 (PST) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Wed, 30 Jan 2019 22:50:14 -0800 Message-Id: <20190131065016.21887-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131065016.21887-1-raj.khem@gmail.com> References: <20190131065016.21887-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [OE-core] [PATCH 4/6] libdnf: Fix build with clang/libc++ 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: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- ...e-missing-string-and-errno.h-headers.patch | 65 +++++++++++++++++++ meta/recipes-devtools/libdnf/libdnf_0.24.1.bb | 1 + 2 files changed, 66 insertions(+) create mode 100644 meta/recipes-devtools/libdnf/libdnf/0001-include-missing-string-and-errno.h-headers.patch -- 2.20.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-include-missing-string-and-errno.h-headers.patch b/meta/recipes-devtools/libdnf/libdnf/0001-include-missing-string-and-errno.h-headers.patch new file mode 100644 index 0000000000..62de784820 --- /dev/null +++ b/meta/recipes-devtools/libdnf/libdnf/0001-include-missing-string-and-errno.h-headers.patch @@ -0,0 +1,65 @@ +From ccc89ff0c1f8e55a4a22444d051925408f265df1 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 30 Jan 2019 10:32:11 -0800 +Subject: [PATCH] include missing and errno.h headers + +This is unearthed when compiling with clang/libc++ + +Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/677] + +Signed-off-by: Khem Raj +--- + libdnf/conf/ConfigParser.hpp | 1 + + libdnf/module/modulemd/ModuleProfile.hpp | 1 + + libdnf/sack/changelog.hpp | 1 + + libdnf/utils/smartcols/Cell.hpp | 1 + + 4 files changed, 4 insertions(+) + +diff --git a/libdnf/conf/ConfigParser.hpp b/libdnf/conf/ConfigParser.hpp +index 97f25500..2a3851fa 100644 +--- a/libdnf/conf/ConfigParser.hpp ++++ b/libdnf/conf/ConfigParser.hpp +@@ -23,6 +23,7 @@ + + #include + #include ++#include + #include + + namespace libdnf { +diff --git a/libdnf/module/modulemd/ModuleProfile.hpp b/libdnf/module/modulemd/ModuleProfile.hpp +index ab018deb..8d996ff4 100644 +--- a/libdnf/module/modulemd/ModuleProfile.hpp ++++ b/libdnf/module/modulemd/ModuleProfile.hpp +@@ -23,6 +23,7 @@ + + + #include ++#include + #include + + #include +diff --git a/libdnf/sack/changelog.hpp b/libdnf/sack/changelog.hpp +index a3d3fc44..d830c414 100644 +--- a/libdnf/sack/changelog.hpp ++++ b/libdnf/sack/changelog.hpp +@@ -23,6 +23,7 @@ + #define __CHANGELOG_HPP + + #include ++#include + + namespace libdnf { + +diff --git a/libdnf/utils/smartcols/Cell.hpp b/libdnf/utils/smartcols/Cell.hpp +index 2e811dee..b90f0050 100644 +--- a/libdnf/utils/smartcols/Cell.hpp ++++ b/libdnf/utils/smartcols/Cell.hpp +@@ -22,6 +22,7 @@ + #define LIBDNF_CELL_HPP + + #include ++#include + #include + #include + diff --git a/meta/recipes-devtools/libdnf/libdnf_0.24.1.bb b/meta/recipes-devtools/libdnf/libdnf_0.24.1.bb index e379d8b256..a55acb2ef0 100644 --- a/meta/recipes-devtools/libdnf/libdnf_0.24.1.bb +++ b/meta/recipes-devtools/libdnf/libdnf_0.24.1.bb @@ -7,6 +7,7 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf \ file://0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch \ file://0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch \ file://0001-Add-WITH_TESTS-option.patch \ + file://0001-include-missing-string-and-errno.h-headers.patch \ " SRCREV = "04b71d78a2170e930a3c248d48a231b19f823064" From patchwork Thu Jan 31 06:50:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 157129 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp6849590jaa; Wed, 30 Jan 2019 22:51:19 -0800 (PST) X-Google-Smtp-Source: ALg8bN6ZP/9dm/WWgsPa68CkhSabgijrLtmqcnHC+FVABs2TeINZTL1/NMlLvj9v1y5boTC2E/g+ X-Received: by 2002:a62:546:: with SMTP id 67mr32955722pff.99.1548917479833; Wed, 30 Jan 2019 22:51:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548917479; cv=none; d=google.com; s=arc-20160816; b=hg0SchghsPMt9NT3+HZEo6/AJxcgVMPyKiWvtoYw46UHidhO6MIn2oPArdCFQe2exZ lf1+4nmMJdyCWoYJgyn6wAP+SqjPo8yVPD6KfZuQRrEk0BKOf2UY1+qdSYE/EwkxxG73 Itb+8qdG+ZKMAifteq99fySfqpSVoJhL4pNPKLEwYE5ftMlCJn8NWkC7BF19uhgJyRrH eLVkW/qmZ4kpEiBru8aUfGKi+vkp948IDsU/tslsCmI2SzyvE9trm0fmMLNRrQ1CMxAc LdxrZOF1c3NQeYhWXzJI0/yonDWTlMx9GImO/D/82CaT+IeIxW/4KFpObB8T4Z57HIKH pNAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=rx+PTW0BoTfTsohgaK1ZynS1jhzygrKlYb4Ir7jpUEw=; b=oufMRh2yt4ThfSXUzrK96IKmTvweoOqPUhhb578uqpYZ1XQmlkmtFlcxeQ9oS0XRA+ 29wqC1hS1kkLGrwjgEG91JjXQdAhdZhKRb4mtc1jhmpvckv6k1b4CMEHDY7sijxd+/nh IF+8+LYJ7F9sE2LLxR6KEfyJQeWiR4l2ShtKIt8VISMjhSIT7FIba33giCG10t+p+4Yg OpDYwhthE/lUg9EIBGg2B1Sz6zcvlANAF6KWPiRdzw2MCD34bjkQCkXZ2yJ7fg0oDDXC 1aF+3PY5pgs0zEPMa680KXbo1wYhudzWFRN8WFXLQjfDaIVfuIoi1bsGnG/QH9y/YvwC 4BYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=P0SsP5ds; 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=QUARANTINE 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 b6si3766424pls.367.2019.01.30.22.51.19; Wed, 30 Jan 2019 22:51:19 -0800 (PST) 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 header.s=20161025 header.b=P0SsP5ds; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from 165.28.230.35.bc.googleusercontent.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 733747C41F; Thu, 31 Jan 2019 06:51:01 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by mail.openembedded.org (Postfix) with ESMTP id 59D9C7C3D1 for ; Thu, 31 Jan 2019 06:50:40 +0000 (UTC) Received: by mail-pf1-f181.google.com with SMTP id q1so1053662pfi.5 for ; Wed, 30 Jan 2019 22:50:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7MctKDTeuRaWzc4A1Wuo85zIHGiNdFeBzldwAAv1SPI=; b=P0SsP5dsl9lWuL8mNP8p7m1rPBbcGWjmklKdnJVgt+2piMOtysDhnM1yWVzv+0IrE4 iTQj/rg1tc7w6c6+4hkkxvDhj78MZJjHwmdkidyGafq1X/5+uKZtabe5B5xELa/5zrK/ 0tsrWUeC2HKltJ+jPClUvKdgldA+TZ6EODocpUF942CpNCfRAP69s0SG5c8xDP8Sbz3O W56CLdMAT2x90WEoJnmxxvMILiT9MXbPvs8JWGnE+sMPsCEYJLJD8mLBblRrGfg76BWk gQtVqkJNAEi5EtvYhNwmUY47e0++fb7FxJmRsUYTen2iXtgHpyxxpeENaStRkVd1CLde C17Q== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=7MctKDTeuRaWzc4A1Wuo85zIHGiNdFeBzldwAAv1SPI=; b=IIZokn8GwxZiCSvzkAo+vxtHGOT6P+deV8hGxLmSW/MtWUAwzL1DpRgFc6FRjbvDYM xEaCZH5w+E5U124bTuNE1ypUO1NAYz+YKuYsUm2fobeDUZ62C5NBRtKp4JF+IuUA2t6A VroAxQB6ZXy0VXu5x+tlC1g8+aV39Hf7fwW4YxX4zFFhiKzjYdxdzN09sLcM3yokx9+6 UWK0KFcIVRWg7xQCbC8VGxx7rfaXQLgmzqCp0HSDx2B67SsxiTg+7Ph5Gj70T7J+E1vY I/cO2OGdgMSn3W5fh1qA5Ac2/UEDVz3bVURXt4I4xLsS/XxW288saWEloWri+S4Pr9xJ 2auw== X-Gm-Message-State: AJcUukdFKgwokpFP7gBXKMF29ezO/4sHwbHoVTUaD2xbLI04yAOen7dP pfnCAypwaXdHpo2AIrZ6eCFrcAc4 X-Received: by 2002:a63:ed42:: with SMTP id m2mr30503169pgk.147.1548917440939; Wed, 30 Jan 2019 22:50:40 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:8500:6bc6::26b6]) by smtp.gmail.com with ESMTPSA id o85sm1080044pfi.105.2019.01.30.22.50.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Jan 2019 22:50:39 -0800 (PST) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Wed, 30 Jan 2019 22:50:15 -0800 Message-Id: <20190131065016.21887-5-raj.khem@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131065016.21887-1-raj.khem@gmail.com> References: <20190131065016.21887-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [OE-core] [PATCH 5/6] webkitgtk: Fix build with clang/libc++ >= 7.0.0 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: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- .../webkitgtk/bad_optional_access.patch | 35 +++++++++++++++++++ meta/recipes-sato/webkit/webkitgtk_2.22.5.bb | 1 + 2 files changed, 36 insertions(+) create mode 100644 meta/recipes-sato/webkit/webkitgtk/bad_optional_access.patch -- 2.20.1 -- _______________________________________________ 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/bad_optional_access.patch b/meta/recipes-sato/webkit/webkitgtk/bad_optional_access.patch new file mode 100644 index 0000000000..9d0d50b79e --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/bad_optional_access.patch @@ -0,0 +1,35 @@ +unbreak build with libc++ 7 + +based on +https://svnweb.freebsd.org/ports/head/www/webkit2-gtk3/files/patch-Source_WTF_wtf_Optional.h?view=markup&pathrev=477812 + +Fixes + +/usr/include/c++/v1/optional:171:29: error: redefinition of 'bad_optional_access' +class _LIBCPP_EXCEPTION_ABI bad_optional_access + ^ +DerivedSources/ForwardingHeaders/wtf/Optional.h:295:7: note: previous definition is here +class bad_optional_access : public std::logic_error { + ^ + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- a/Source/WTF/wtf/Optional.h ++++ b/Source/WTF/wtf/Optional.h +@@ -276,14 +276,14 @@ struct nullopt_t + }; + constexpr nullopt_t nullopt{nullopt_t::init()}; + +- ++# if !defined(_LIBCPP_VERSION) || _LIBCPP_VERSION < 7000 + // 20.5.8, class bad_optional_access + class bad_optional_access : public std::logic_error { + public: + explicit bad_optional_access(const std::string& what_arg) : std::logic_error{what_arg} {} + explicit bad_optional_access(const char* what_arg) : std::logic_error{what_arg} {} + }; +- ++# endif // _LIBCPP_VERSION < 7000 + + template + union storage_t diff --git a/meta/recipes-sato/webkit/webkitgtk_2.22.5.bb b/meta/recipes-sato/webkit/webkitgtk_2.22.5.bb index e3579e472b..3d8c0338c7 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.22.5.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.22.5.bb @@ -20,6 +20,7 @@ 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://bad_optional_access.patch \ " SRC_URI[md5sum] = "96a731522b800f38e70f85c22f8de477" From patchwork Thu Jan 31 06:50:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 157130 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp6849700jaa; Wed, 30 Jan 2019 22:51:27 -0800 (PST) X-Google-Smtp-Source: ALg8bN5txRN/C5cdmR83xXR9rDL9xYbnsMAXY0sOKf7yvDjkgbLImUYDSWPLgd89xY6eE0OoVl9K X-Received: by 2002:a63:d747:: with SMTP id w7mr29714311pgi.360.1548917487642; Wed, 30 Jan 2019 22:51:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548917487; cv=none; d=google.com; s=arc-20160816; b=G03AYeBVEikiMT6YKp7Li8+EHKdgaFyAIxMeRfU0VxVhOravyUm7o83lCxbEfOrK+A mpRX5uGdN80VVMoVHpR+6DIn5HkWKc8dz47JaV1NCBfV+MfyuuLlKbz1bzOLbkKlJOid pKnmDAHhxhlK7WvYnvnOSRK+g1CpbDSSj3rrJxgRDMcMO9PbECLYogsqodIMJZT/Fhbm H/XEwNNe6eALurpnDs/H3GaG31LgjjNXOJ6/kUFRFvCqMsspBpkWrQZQV9o6nRn+/kum 2wvBZVSn9Wu4BXrYfflroEQz17E+/GSy/2rlt6/ZXpmhaT/yoRBW57qKHfS0kSwfVM5R 5XXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=30btq5q7HzP1TTJs21Z+Dn4ZW+l9UTnXXl7dAWmY0vE=; b=kEDtkC+mwH2SYpY0hMaOgGAtwGcemuzAog6SgzbMZqLuAYs7ySzRn8DD0eRyUBkKl8 Fqgbg6vTAFH5sUKCo6gW91S9bsoL3u2w+I5ieOFwkyVDdEx0CkhWb2kgYql432WTkPkZ tl+1fuSw4yjuZdCYgwAOVlpHc/iXSAH1JqMmzRg2ZK64HVnFDKsrd9u/gb+rWzbwG7x8 kS1mSjs+04HPpKLZ0UYEW239IAr8dIbrxFvcA8moHL5aZ+fWbv+WlhBJRAV0xHunDEcc rgSWGfUVeOL46Wlc2w+GTCR6koG03sctIfd5sBHLOgU8jp19zzzCmrX7+cuMgtQOAj5n piOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=rMeFDrAn; 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=QUARANTINE 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 k1si2082624pfj.45.2019.01.30.22.51.27; Wed, 30 Jan 2019 22:51:27 -0800 (PST) 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 header.s=20161025 header.b=rMeFDrAn; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from 165.28.230.35.bc.googleusercontent.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 87CC07C42E; Thu, 31 Jan 2019 06:51:06 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by mail.openembedded.org (Postfix) with ESMTP id 7FF457C3D9 for ; Thu, 31 Jan 2019 06:50:41 +0000 (UTC) Received: by mail-pf1-f181.google.com with SMTP id r136so1052006pfc.6 for ; Wed, 30 Jan 2019 22:50:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lMtbFfrL6dBdvVwhmfjq5SChK6RECXS9Huzed0UrrBU=; b=rMeFDrAnLRj0HQXOlW9AGV4pK3kCgQEkf2QpmR6Uh3FvxUsYG1cRhpPse8SOmCAsTW dwkcBgpv1kqQJfiQr6hMdC9W6kI8UlDkQs9I5y3pgY8dHE8NuJ3GIXDHbdfPsYhOzcZw 1NWCNeDBPPde9zOU1d2g849n2r4AhdzqdH7D99BJqWFpsMIFh5rRZABDiBZE/2YWTZIP 6Ypcrn8URWHlrgjBC0iteNr7jBbjLBTTM/v4+Csjw5F/nzGqoB2egO890uJFyyoKPGC1 gMPjGg/eo3ojG0TZf2OMvhz7AfB1UHqmF2U6Z/9HIzq0vrn4bn3PU9wcAEBjM/HhCIXp t+dg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=lMtbFfrL6dBdvVwhmfjq5SChK6RECXS9Huzed0UrrBU=; b=eE8wRsPoIsZVJNg8QR7Sb2WGuvF6v/MzEQUhFVcoxOQPOlGSIaLsoOu2qrs7vrnP6e EMgLZ3IFXXzFYURGy460gi0RMXMZc248XzA6wo+zjAGy7W0k/Mx7oRlMo7417cTMmAXl aYhn30d2kNLU+6qTRYYEUiHx+4Dta+yfNiiseUs09pY4VDfXpWRWBo0QRVPrE6qGhu9a IjnaqenxhDPMVUp+qflDFQ0UMUx7CjpakoN1i9HVF7Q4aKRv5kIZ6mSgAbG5G5Y7KbXV LMoRP7mq+gVHuDZBA+s7MB747PUffVMtzU+HP3I7j4oTp95T9w3BvEAbawbp9c14jCPU /tDA== X-Gm-Message-State: AJcUukcjikkMLCJeNymMeigygmAa0A+dv4H7aabT98fUaBpI3rFHpWVV wJYOAwq90T3eBQzsXMjBPTCyeasC X-Received: by 2002:a63:f658:: with SMTP id u24mr30659242pgj.267.1548917442302; Wed, 30 Jan 2019 22:50:42 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:8500:6bc6::26b6]) by smtp.gmail.com with ESMTPSA id o85sm1080044pfi.105.2019.01.30.22.50.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Jan 2019 22:50:41 -0800 (PST) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Wed, 30 Jan 2019 22:50:16 -0800 Message-Id: <20190131065016.21887-6-raj.khem@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131065016.21887-1-raj.khem@gmail.com> References: <20190131065016.21887-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [OE-core] [PATCH 6/6] llvm: Upgrade to upcoming 8.0.0 release 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: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org License-Update: Copyright year updates from 2017-2019 Refresh patches to apply on new version Signed-off-by: Khem Raj --- ...ryInfo-Undefine-libc-functions-if-th.patch | 28 ++++---- ...-llvm-allow-env-override-of-exe-path.patch | 66 +++++++++++++++---- meta/recipes-devtools/llvm/llvm_git.bb | 25 ++++--- 3 files changed, 83 insertions(+), 36 deletions(-) -- 2.20.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/llvm/llvm/0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch b/meta/recipes-devtools/llvm/llvm/0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch index 209764c8ba..6dbbced7eb 100644 --- a/meta/recipes-devtools/llvm/llvm/0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch +++ b/meta/recipes-devtools/llvm/llvm/0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch @@ -1,24 +1,22 @@ -From 96558c4f25d5132936014f6f2d6252cfdfdf478a Mon Sep 17 00:00:00 2001 +From 905cac8934fb17e20416a4df712a566e757471a3 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 21 May 2016 00:33:20 +0000 -Subject: [PATCH 1/2] llvm: TargetLibraryInfo: Undefine libc functions if they - are macros +Subject: [PATCH 1/2] llvm: TargetLibraryInfo: Undefine libc functions if they are macros musl defines some functions as macros and not inline functions if this is the case then make sure to undefine them +Upstream-Status: Pending Signed-off-by: Khem Raj --- -Upstream-Status: Pending - include/llvm/Analysis/TargetLibraryInfo.def | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/llvm/Analysis/TargetLibraryInfo.def b/include/llvm/Analysis/TargetLibraryInfo.def -index a461ed813b9..f9fd9faeee0 100644 +index 518a85ee1a0..6b4ead4efc6 100644 --- a/include/llvm/Analysis/TargetLibraryInfo.def +++ b/include/llvm/Analysis/TargetLibraryInfo.def -@@ -665,6 +665,9 @@ TLI_DEFINE_STRING_INTERNAL("fmodl") +@@ -731,6 +731,9 @@ TLI_DEFINE_STRING_INTERNAL("fmodl") TLI_DEFINE_ENUM_INTERNAL(fopen) TLI_DEFINE_STRING_INTERNAL("fopen") /// FILE *fopen64(const char *filename, const char *opentype) @@ -27,8 +25,8 @@ index a461ed813b9..f9fd9faeee0 100644 +#endif TLI_DEFINE_ENUM_INTERNAL(fopen64) TLI_DEFINE_STRING_INTERNAL("fopen64") - /// int fprintf(FILE *stream, const char *format, ...); -@@ -700,6 +703,9 @@ TLI_DEFINE_STRING_INTERNAL("fseek") + /// int fork(); +@@ -778,6 +781,9 @@ TLI_DEFINE_STRING_INTERNAL("fseek") /// int fseeko(FILE *stream, off_t offset, int whence); TLI_DEFINE_ENUM_INTERNAL(fseeko) TLI_DEFINE_STRING_INTERNAL("fseeko") @@ -38,7 +36,7 @@ index a461ed813b9..f9fd9faeee0 100644 /// int fseeko64(FILE *stream, off64_t offset, int whence) TLI_DEFINE_ENUM_INTERNAL(fseeko64) TLI_DEFINE_STRING_INTERNAL("fseeko64") -@@ -710,6 +716,9 @@ TLI_DEFINE_STRING_INTERNAL("fsetpos") +@@ -788,6 +794,9 @@ TLI_DEFINE_STRING_INTERNAL("fsetpos") TLI_DEFINE_ENUM_INTERNAL(fstat) TLI_DEFINE_STRING_INTERNAL("fstat") /// int fstat64(int filedes, struct stat64 *buf) @@ -48,7 +46,7 @@ index a461ed813b9..f9fd9faeee0 100644 TLI_DEFINE_ENUM_INTERNAL(fstat64) TLI_DEFINE_STRING_INTERNAL("fstat64") /// int fstatvfs(int fildes, struct statvfs *buf); -@@ -725,6 +734,9 @@ TLI_DEFINE_STRING_INTERNAL("ftell") +@@ -803,6 +812,9 @@ TLI_DEFINE_STRING_INTERNAL("ftell") TLI_DEFINE_ENUM_INTERNAL(ftello) TLI_DEFINE_STRING_INTERNAL("ftello") /// off64_t ftello64(FILE *stream) @@ -58,7 +56,7 @@ index a461ed813b9..f9fd9faeee0 100644 TLI_DEFINE_ENUM_INTERNAL(ftello64) TLI_DEFINE_STRING_INTERNAL("ftello64") /// int ftrylockfile(FILE *file); -@@ -845,6 +857,9 @@ TLI_DEFINE_STRING_INTERNAL("logl") +@@ -929,6 +941,9 @@ TLI_DEFINE_STRING_INTERNAL("logl") TLI_DEFINE_ENUM_INTERNAL(lstat) TLI_DEFINE_STRING_INTERNAL("lstat") /// int lstat64(const char *path, struct stat64 *buf); @@ -68,7 +66,7 @@ index a461ed813b9..f9fd9faeee0 100644 TLI_DEFINE_ENUM_INTERNAL(lstat64) TLI_DEFINE_STRING_INTERNAL("lstat64") /// void *malloc(size_t size); -@@ -1064,6 +1079,9 @@ TLI_DEFINE_STRING_INTERNAL("sscanf") +@@ -1154,6 +1169,9 @@ TLI_DEFINE_STRING_INTERNAL("sscanf") TLI_DEFINE_ENUM_INTERNAL(stat) TLI_DEFINE_STRING_INTERNAL("stat") /// int stat64(const char *path, struct stat64 *buf); @@ -78,7 +76,7 @@ index a461ed813b9..f9fd9faeee0 100644 TLI_DEFINE_ENUM_INTERNAL(stat64) TLI_DEFINE_STRING_INTERNAL("stat64") /// int statvfs(const char *path, struct statvfs *buf); -@@ -1193,6 +1211,9 @@ TLI_DEFINE_STRING_INTERNAL("times") +@@ -1283,6 +1301,9 @@ TLI_DEFINE_STRING_INTERNAL("times") TLI_DEFINE_ENUM_INTERNAL(tmpfile) TLI_DEFINE_STRING_INTERNAL("tmpfile") /// FILE *tmpfile64(void) @@ -89,5 +87,5 @@ index a461ed813b9..f9fd9faeee0 100644 TLI_DEFINE_STRING_INTERNAL("tmpfile64") /// int toascii(int c); -- -2.16.1 +2.20.1 diff --git a/meta/recipes-devtools/llvm/llvm/0002-llvm-allow-env-override-of-exe-path.patch b/meta/recipes-devtools/llvm/llvm/0002-llvm-allow-env-override-of-exe-path.patch index 6a9283323c..2970b0827b 100644 --- a/meta/recipes-devtools/llvm/llvm/0002-llvm-allow-env-override-of-exe-path.patch +++ b/meta/recipes-devtools/llvm/llvm/0002-llvm-allow-env-override-of-exe-path.patch @@ -1,4 +1,4 @@ -From aeccf16eaccdd80e4d5ecaa51673ce4b2bac1130 Mon Sep 17 00:00:00 2001 +From 0570fe02c07244a8724c1e6c0437f893c8aa8e93 Mon Sep 17 00:00:00 2001 From: Martin Kelly Date: Fri, 19 May 2017 00:22:57 -0700 Subject: [PATCH 2/2] llvm: allow env override of exe path @@ -16,16 +16,16 @@ Upstream-Status: Inappropriate [OE-Specific] Signed-off-by: Martin Kelly Signed-off-by: Khem Raj --- - tools/llvm-config/llvm-config.cpp | 17 ++++++++++++++++- - 1 file changed, 16 insertions(+), 1 deletion(-) + tools/llvm-config/llvm-config.cpp | 35 ++++++++++++++++++++++--------- + 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index 08b096afb05..360cc5abf4e 100644 +index bec89fef98c..91b4d6e4c43 100644 --- a/tools/llvm-config/llvm-config.cpp +++ b/tools/llvm-config/llvm-config.cpp -@@ -225,6 +225,13 @@ Typical components:\n\ +@@ -226,6 +226,13 @@ Typical components:\n\ - /// \brief Compute the path to the main executable. + /// Compute the path to the main executable. std::string GetExecutablePath(const char *Argv0) { + // Hack for Yocto: we need to override the root path when we are using + // llvm-config from within a target sysroot. @@ -37,7 +37,25 @@ index 08b096afb05..360cc5abf4e 100644 // This just needs to be some symbol in the binary; C++ doesn't // allow taking the address of ::main however. void *P = (void *)(intptr_t)GetExecutablePath; -@@ -306,12 +313,20 @@ int main(int argc, char **argv) { +@@ -284,7 +291,7 @@ int main(int argc, char **argv) { + // bin dir). + sys::fs::make_absolute(CurrentPath); + CurrentExecPrefix = +- sys::path::parent_path(sys::path::parent_path(CurrentPath)).str(); ++ sys::path::parent_path(sys::path::parent_path(sys::path::parent_path(CurrentPath))).str(); + + // Check to see if we are inside a development tree by comparing to possible + // locations (prefix style or CMake style). +@@ -293,7 +300,7 @@ int main(int argc, char **argv) { + DevelopmentTreeLayout = CMakeStyle; + ActiveObjRoot = LLVM_OBJ_ROOT; + } else if (sys::fs::equivalent(CurrentExecPrefix, +- Twine(LLVM_OBJ_ROOT) + "/bin")) { ++ Twine(LLVM_OBJ_ROOT) + "/bin/llvm8.0")) { + IsInDevelopmentTree = true; + DevelopmentTreeLayout = CMakeBuildModeStyle; + ActiveObjRoot = LLVM_OBJ_ROOT; +@@ -307,37 +314,45 @@ int main(int argc, char **argv) { std::string ActivePrefix, ActiveBinDir, ActiveIncludeDir, ActiveLibDir, ActiveCMakeDir; std::string ActiveIncludeOption; @@ -45,11 +63,12 @@ index 08b096afb05..360cc5abf4e 100644 + // llvm-config from within a target sysroot. + std::string Multilibdir = std::getenv("YOCTO_ALTERNATE_MULTILIB_NAME"); + if (Multilibdir.empty()) { -+ Multilibdir = "/lib" LLVM_LIBDIR_SUFFIX; ++ Multilibdir = "/lib/llvm8.0" LLVM_LIBDIR_SUFFIX; + } + if (IsInDevelopmentTree) { - ActiveIncludeDir = std::string(LLVM_SRC_ROOT) + "/include"; +- ActiveIncludeDir = std::string(LLVM_SRC_ROOT) + "/include"; ++ ActiveIncludeDir = std::string(LLVM_SRC_ROOT) + "/include/llvm8.0"; ActivePrefix = CurrentExecPrefix; // CMake organizes the products differently than a normal prefix style @@ -57,8 +76,31 @@ index 08b096afb05..360cc5abf4e 100644 + switch (DevelopmentTreeLayout) { case CMakeStyle: - ActiveBinDir = ActiveObjRoot + "/bin"; -@@ -336,7 +351,7 @@ int main(int argc, char **argv) { +- ActiveBinDir = ActiveObjRoot + "/bin"; +- ActiveLibDir = ActiveObjRoot + "/lib" + LLVM_LIBDIR_SUFFIX; ++ ActiveBinDir = ActiveObjRoot + "/bin/llvm8.0"; ++ ActiveLibDir = ActiveObjRoot + "/lib/llvm8.0" + LLVM_LIBDIR_SUFFIX; + ActiveCMakeDir = ActiveLibDir + "/cmake/llvm"; + break; + case CMakeBuildModeStyle: + ActivePrefix = ActiveObjRoot; +- ActiveBinDir = ActiveObjRoot + "/bin/" + build_mode; ++ ActiveBinDir = ActiveObjRoot + "/bin/llvm8.0/" + build_mode; + ActiveLibDir = +- ActiveObjRoot + "/lib" + LLVM_LIBDIR_SUFFIX + "/" + build_mode; ++ ActiveObjRoot + "/lib/llvm8.0" + LLVM_LIBDIR_SUFFIX + "/" + build_mode; + ActiveCMakeDir = ActiveLibDir + "/cmake/llvm"; + break; + } + + // We need to include files from both the source and object trees. + ActiveIncludeOption = +- ("-I" + ActiveIncludeDir + " " + "-I" + ActiveObjRoot + "/include"); ++ ("-I" + ActiveIncludeDir + " " + "-I" + ActiveObjRoot + "/include/llvm8.0"); + } else { + ActivePrefix = CurrentExecPrefix; +- ActiveIncludeDir = ActivePrefix + "/include"; ++ ActiveIncludeDir = ActivePrefix + "/include/llvm8.0"; SmallString<256> path(StringRef(LLVM_TOOLS_INSTALL_DIR)); sys::fs::make_absolute(ActivePrefix, path); ActiveBinDir = path.str(); @@ -68,5 +110,5 @@ index 08b096afb05..360cc5abf4e 100644 ActiveIncludeOption = "-I" + ActiveIncludeDir; } -- -2.18.0 +2.20.1 diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb index eb0779d6ec..a3dcab175d 100644 --- a/meta/recipes-devtools/llvm/llvm_git.bb +++ b/meta/recipes-devtools/llvm/llvm_git.bb @@ -6,7 +6,7 @@ HOMEPAGE = "http://llvm.org" LICENSE = "NCSA" SECTION = "devel" -LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=e825e017edc35cfd58e26116e5251771" +LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=c6b766a4e85dd28301eeed54a6684648" DEPENDS = "libffi libxml2 zlib ninja-native llvm-native" @@ -19,18 +19,22 @@ PROVIDES += "llvm${PV}" LLVM_RELEASE = "${PV}" LLVM_DIR = "llvm${LLVM_RELEASE}" -SRCREV = "5136df4d089a086b70d452160ad5451861269498" -PV = "6.0" -BRANCH = "release_60" -PATCH_VERSION = "1" -SRC_URI = "git://github.com/llvm-mirror/llvm.git;branch=${BRANCH};protocol=http \ +SRCREV = "5a46917218575e92e3f0f9378338fd215be39107" +BRANCH = "release_${MAJOR_VERSION}${MINOR_VERSION}" +MAJOR_VERSION = "8" +MINOR_VERSION = "0" +PATCH_VERSION = "0" +PV = "${MAJOR_VERSION}.${MINOR_VERSION}" +SRC_URI = "git://github.com/llvm-mirror/llvm.git;branch=${BRANCH} \ file://0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch \ file://0002-llvm-allow-env-override-of-exe-path.patch \ " UPSTREAM_CHECK_COMMITS = "1" + S = "${WORKDIR}/git" LLVM_INSTALL_DIR = "${WORKDIR}/llvm-install" + def get_llvm_arch(bb, d, arch_var): import re a = d.getVar(arch_var) @@ -117,7 +121,7 @@ do_install() { # Remove unnecessary cmake files rm -rf ${D}${libdir}/${LLVM_DIR}/cmake - ln -s ${LLVM_DIR}/libLLVM-${PV}${SOLIBSDEV} ${D}${libdir}/libLLVM-${PV}${SOLIBSDEV} + ln -s ${LLVM_DIR}/libLLVM-${MAJOR_VERSION}${SOLIBSDEV} ${D}${libdir}/libLLVM-${MAJOR_VERSION}${SOLIBSDEV} # We'll have to delete the libLLVM.so due to multiple reasons... rm -rf ${D}${libdir}/${LLVM_DIR}/libLLVM.so @@ -126,7 +130,7 @@ do_install() { do_install_class-native() { install -D -m 0755 ${B}/bin/llvm-tblgen ${D}${bindir}/llvm-tblgen${PV} install -D -m 0755 ${B}/bin/llvm-config ${D}${bindir}/llvm-config${PV} - install -D -m 0755 ${B}/lib/libLLVM-${PV}.so ${D}${libdir}/libLLVM-${PV}.so + install -D -m 0755 ${B}/lib/libLLVM-${MAJOR_VERSION}.so ${D}${libdir}/libLLVM-${MAJOR_VERSION}.so } PACKAGES += "${PN}-bugpointpasses ${PN}-llvmhello" @@ -139,6 +143,7 @@ FILES_${PN}-dbg = " \ ${libdir}/${LLVM_DIR}/.debug/BugpointPasses.so \ ${libdir}/${LLVM_DIR}/.debug/LLVMHello.so \ ${libdir}/${LLVM_DIR}/.debug/libLTO.so* \ + ${libdir}/${LLVM_DIR}/.debug/libOptRemarks.so* \ ${libdir}/${LLVM_DIR}/.debug/llvm-config \ /usr/src/debug \ " @@ -147,6 +152,7 @@ FILES_${PN}-dev = " \ ${bindir}/${LLVM_DIR} \ ${includedir}/${LLVM_DIR} \ ${libdir}/${LLVM_DIR}/llvm-config \ + ${libdir}/${LLVM_DIR}/libOptRemarks.so \ " RRECOMMENDS_${PN}-dev += "${PN}-bugpointpasses ${PN}-llvmhello" @@ -156,6 +162,7 @@ FILES_${PN}-bugpointpasses = "\ " FILES_${PN} += "\ ${libdir}/${LLVM_DIR}/libLTO.so.* \ + ${libdir}/${LLVM_DIR}/libOptRemarks.so.* \ " FILES_${PN}-llvmhello = "\ @@ -166,7 +173,7 @@ PACKAGES_DYNAMIC = "^libllvm${LLVM_RELEASE}-.*$" NOAUTOPACKAGEDEBUG = "1" INSANE_SKIP_${MLPREFIX}libllvm${LLVM_RELEASE}-llvm-${LLVM_RELEASE}.${PATCH_VERSION} += "dev-so" -INSANE_SKIP_${MLPREFIX}libllvm${LLVM_RELEASE}-llvm-${LLVM_RELEASE} += "dev-so" +INSANE_SKIP_${MLPREFIX}libllvm${LLVM_RELEASE}-llvm-${MAJOR_VERSION} += "dev-so" INSANE_SKIP_${MLPREFIX}libllvm${LLVM_RELEASE}-llvm += "dev-so" python llvm_populate_packages() {