From patchwork Mon Jul 22 21:18: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: 169427 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp7992216ilk; Mon, 22 Jul 2019 14:18:55 -0700 (PDT) X-Google-Smtp-Source: APXvYqxMOFdV+PzxEs5FH+zfLasyXOx6GavOzBlq2d2UII7OXhGLuhfxXtY4k70x9BvCbSvNa0qA X-Received: by 2002:a17:90a:36a7:: with SMTP id t36mr77417799pjb.34.1563830335008; Mon, 22 Jul 2019 14:18:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563830335; cv=none; d=google.com; s=arc-20160816; b=HLRs5hjDaqrKxAdwbUm4Qhl0jRL05w6AdZwHTAaSZTerrltLZCtCipxrwGwmlyDaho XRYVx9l5SlETdC2rQNnErFDA/jdUo6eh7SskRexsSwdsuHnm9BF3msf1Cc14qgaSa0Y3 so23SBOWOgnEl3nNsfi84HUL2d2lFgsYeuTQElqCBv3wJVrO+R3FqGkRHO70mAz5TCDn /LCA+oNZgX2Hks6y1Q5ZERmkqZRrCzdQNIYLChi9nmR1hj9YEIR0/jPufzQNoNKZyyX4 nnQyaTYrCMebfej7aSSYy6LYzUcGatJH17BXMyMWACpfvWYrpfvOF6sQT3UvZGjw0Ah9 tGKQ== 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 :cc:mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=IFgjYuqIcLH5R/Z52Y8R3Ys/7C3ovrnPWfa4WqF81Y8=; b=Bvr11Erv+Gm7INcz9sA3nGRACd7GD38WNVp5xROrgreJqgxdFsLGt+uuGZmC53MWlv IaQPZpQ5ECfAlTi7rLJded95vW1nhBaAbv7j55Bl3fG6ShvlWJAL1dyg+fj1PhDtqCAF /qv7wiff0UD+eyMclEIpX7HtdPbtSP9gN+twTg8YPZhuSl68KZOhc4Ezlq5/lM2nyqZN OgyXhmyXUbUVXXy4aYE2nm4ESknc1HPiKBMypdsAUpcjVolbvD0Y9XIzNSHdlva9QBNi 3VBzVL/bIP9JzWvofIx3CRVh3H48heRInPb3ArP3+GvdVxv7SC8Q3CAkJq+zbHe095e5 thkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=gV8DmL1P; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-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 b6si9998331pjz.29.2019.07.22.14.18.54; Mon, 22 Jul 2019 14:18:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-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=gV8DmL1P; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id BBA2A7F021; Mon, 22 Jul 2019 21:18:51 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by mail.openembedded.org (Postfix) with ESMTP id 2C2E47E97A for ; Mon, 22 Jul 2019 21:18:24 +0000 (UTC) Received: by mail-pg1-f196.google.com with SMTP id i18so18260893pgl.11 for ; Mon, 22 Jul 2019 14:18:25 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=RR1+ziXPZZZi31Kxd3aFOGKTgnfeiAs774lMZt+SMD8=; b=gV8DmL1P1Qx0qj0R7EKiaZEDRBi2fgSs9/ZF5bJ1dMTM022cQIWXJQig6/Zq4GpTJN 5N9cHmUFGtn4wd/4UO8sPjIUFyiMe1N+lO2MCjpBRCfrf/512xLtHh+r3NmXW3vfIyXY Vc++G7tKCY5AV9sxP9UDP28ac1YW3l9hQFlEq+377rHUyPc26HGEMCgAkzR60IUaK06K vm/6UqDE5c0mFTeFfmLTw+fp+zGWSZHwY6toR/zTaVoG7jXCtjKlptfYiN8XBhCVXk9I mfQATB347kg14hwP4rx2xwXwPCIUYHbjs1FGwP1Db8J9j9RgmT0nfvDQBjraTSHw/GqC UHEQ== 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=RR1+ziXPZZZi31Kxd3aFOGKTgnfeiAs774lMZt+SMD8=; b=jkoesb0GyBGKn13cHbDqmq/UjppevHMl/OPZWoFqSG09f8Ex2+5GAuFDggIZuQpPHY PM6lwfOprChAF0QlD9tZJGu7UuNgyRw1x9X8aeJ2N1lHwLTKKFkpSDROvpXpNYMEp8j2 qn+NoQqUM7k1Ia9DOkAf2b+wEwSBN6H/EyFt4VDwuZjwRK2ngKH9TIoSETi026f/38su xKhpOgCHkcc4bfAeqZT40zixOWXVN6s1yMKbFjPMO/MroBbGQvS1bRzh45YUz8Wsgvvs lfvv1Qftb7iha10MMZVP4gEuYmLbMwqLkbiZptHGDeqL87+2zb190iFEagGyiO3Jar8z gX9A== X-Gm-Message-State: APjAAAXn1ZJpY6/T3TUL9dZ5vsR3OIOFVSu4bAkUMSyJJSG3cbh88hk0 qwc/pVWgTvn47YLKdyl7IL7ipCBkWvE= X-Received: by 2002:a62:e71a:: with SMTP id s26mr2124206pfh.89.1563830304785; Mon, 22 Jul 2019 14:18:24 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net (c-73-71-176-3.hsd1.ca.comcast.net. [73.71.176.3]) by smtp.gmail.com with ESMTPSA id a3sm36347816pfl.145.2019.07.22.14.18.24 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 22 Jul 2019 14:18:24 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 22 Jul 2019 14:18:14 -0700 Message-Id: <20190722211814.14237-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190722211814.14237-1-raj.khem@gmail.com> References: <20190722211814.14237-1-raj.khem@gmail.com> MIME-Version: 1.0 Cc: Adrian Bunk Subject: [oe] [meta-oe][PATCH] log4cplus: Fix build with gold linker X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Fixes a potential linker error and eventual linker crash when using gold linker [1] [1] https://errors.yoctoproject.org/Errors/Details/253440/ Signed-off-by: Khem Raj Cc: Adrian Bunk Cc: Mingli Yu --- ...-version-entry-from-ELF-.comment-sec.patch | 40 +++++++++++++++++++ .../log4cplus/log4cplus_2.0.4.bb | 6 ++- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-devtools/log4cplus/log4cplus/0001-Remove-log4cplus-version-entry-from-ELF-.comment-sec.patch -- 2.22.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-devtools/log4cplus/log4cplus/0001-Remove-log4cplus-version-entry-from-ELF-.comment-sec.patch b/meta-oe/recipes-devtools/log4cplus/log4cplus/0001-Remove-log4cplus-version-entry-from-ELF-.comment-sec.patch new file mode 100644 index 0000000000..44a835c35f --- /dev/null +++ b/meta-oe/recipes-devtools/log4cplus/log4cplus/0001-Remove-log4cplus-version-entry-from-ELF-.comment-sec.patch @@ -0,0 +1,40 @@ +From da5338e68f146efadab7c221291ba4c949d8f12f Mon Sep 17 00:00:00 2001 +From: Vaclav Haisman +Date: Sun, 21 Jul 2019 23:23:16 -0700 +Subject: [PATCH] Remove log4cplus version entry from ELF .comment section + +Reverts +https://github.com/log4cplus/log4cplus/commit/9cb0d4ade619da4e40628c9b95ff51de3df29f1b + +Upstream-Status: Backport [https://github.com/log4cplus/log4cplus/commit/7e6addc70dffd2e30e902efd18eb845c5d5dd7bb] + +Suggested-by: Adrian Bunk +Signed-off-by: Khem Raj +--- + src/version.cxx | 12 ------------ + 1 file changed, 12 deletions(-) + +diff --git a/src/version.cxx b/src/version.cxx +index ce18212..e002de9 100644 +--- a/src/version.cxx ++++ b/src/version.cxx +@@ -34,16 +34,4 @@ namespace log4cplus + unsigned const version = LOG4CPLUS_VERSION; + char const versionStr[] = LOG4CPLUS_VERSION_STR LOG4CPLUS_VERSION_STR_SUFFIX; + +-namespace +-{ +- +-#if defined (__ELF__) && (defined (__GNUC__) || defined (__clang__)) +-char const versionStrComment[] +- __attribute__ ((__used__, __section__ ((".comment")))) +- = "log4cplus " LOG4CPLUS_VERSION_STR LOG4CPLUS_VERSION_STR_SUFFIX; +-#endif +- +- +-} // namespace +- + } // namespace log4cplus +-- +2.22.0 + diff --git a/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.4.bb b/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.4.bb index d86521aba3..b396cabf3f 100644 --- a/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.4.bb +++ b/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.4.bb @@ -6,7 +6,9 @@ BUGTRACKER = "http://sourceforge.net/p/log4cplus/bugs/" LICENSE = "Apache-2.0 & BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=41e8e060c26822886b592ab4765c756b" -SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}-stable/${PV}/${BP}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}-stable/${PV}/${BP}.tar.gz \ + file://0001-Remove-log4cplus-version-entry-from-ELF-.comment-sec.patch \ + " SRC_URI[md5sum] = "2b5b7bc294698bf30a315a259ef9eec2" SRC_URI[sha256sum] = "196eedbc7f2dd792dae721b1159c7ac132255bb368226353c24d4d5fa7c7797a" @@ -16,3 +18,5 @@ UPSTREAM_CHECK_REGEX = "log4cplus-stable/(?P\d+(\.\d+)+)/" inherit autotools pkgconfig BBCLASSEXTEND = "native" + +CXXFLAGS += "-fuse-ld=gold"