From patchwork Tue Nov 6 12:24:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 150269 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3820460ljp; Tue, 6 Nov 2018 04:24:41 -0800 (PST) X-Google-Smtp-Source: AJdET5fngmrIWW2wf7n1zrWwx/kl6QGaZgABjD3yIfCLAHbnmUcl1zKKpO03jDJAAXXoLhrHDbF2 X-Received: by 2002:a63:9a52:: with SMTP id e18mr20762034pgo.14.1541507081780; Tue, 06 Nov 2018 04:24:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541507081; cv=none; d=google.com; s=arc-20160816; b=TqrSwquXzuKge9lU+3mnFv6WWsY0Kx+O6JtuNRt2nL+MomeKdHoFUf2uttXDErYsgM gkSKLSZuTskRv0wqUPIxo5xJKQjT1trrXNNoCOzSLmnpVSK+gH+cvJENyut2g2rmZ+RB gbYzdpMd78QLo+dZLqypcZltgy/CJqmSwHT3EHUAFjtX/a71/iUvqfkVdW5u5yqKiREx WEetsYD07cJAgq31UyovTTOzXILX7zD7ij2zrzm1hGTjfTrgq2XMwLLkMln7NoWzTe76 gOnvRAn/3rIKwMLrpYrBgADLvjDhLPx+B3t0biR9dscgbpSByN4ttWOwP68+icf1w9Q8 sGrQ== 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; bh=OEwnyoorQ+JacY+QdSwUVe5683bIWk1+syD4stxpHgg=; b=CnAMaKoGTMQoPofXr649LCwOixdEG4xb7/kLaM4SAhDMup6VlhU3BbyswO0ALYo1d4 PgdDQGuUyojPwTeQOblwd4BslGkTE2vgFHcWPHVAcqq5+h3rWmh1PxCcOvwv0HvAwodR PYehENvz3k6yW6UL199iI6BSAQTQC8cMguFO1He5sqg2FSW3F0wh0F3Ceof+jIWAwqIk +jyKAm2O1wuqHyvNLLHlQYI1YBb0mGeXMXNgqgtDfjQ7NjYo36IwdVNcTU9H8t2EFiOg /eM+DWH0qN4j/Vx9eJbR6zoq5zcM4USTgQASt/9DEnnJkn7XqkFNVD660oG/zmTytx8i Zv2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=kLgoi7nR; 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=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id k6-v6si45277969pgl.454.2018.11.06.04.24.40; Tue, 06 Nov 2018 04:24:41 -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=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=kLgoi7nR; 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=intel.com Received: from 165.28.230.35.bc.googleusercontent.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 6F21179456; Tue, 6 Nov 2018 12:24:35 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by mail.openembedded.org (Postfix) with ESMTP id 2483379456 for ; Tue, 6 Nov 2018 12:24:33 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id d10-v6so13266015wrs.5 for ; Tue, 06 Nov 2018 04:24:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=7QFEYDA3JtlZP3e5rfQ2C+gDAaFK1IukmkeegQxfkSI=; b=kLgoi7nR0zB2aW0Ff78BxxO4iI6k66wslw5VqYBjSVHngHNLwsk8yKf+ThBYPuIdR3 BTYu1edSc7sUIz41Bt0vg1axOGBNBgEXkpJupdE9ozZleRqkLOQDuqjOUtdW8zHmVw6V 2alkk8XA+VM17IrHeM1dA775z+g93hkczdX4ZXoI/KCfn7KemThEAXFc3IMigs3EydtC whrpYBF63zZ2rAsw+pBD9gZgsjpUsFhv+UkzZopgLKZnI1wgyDBusodpe2jQBlp8Kr8w lWBmpgLr1MvmZhP7f8Yuj6/VXJBNtFbdJwKK0LON6ocmYGT6x92a6QLsCSFQA6YNdkXB zaHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=7QFEYDA3JtlZP3e5rfQ2C+gDAaFK1IukmkeegQxfkSI=; b=DsfqZzXVdW1tHiCM3nGNUNvH4Xo2yZjnMxGiavfi+Eo6ZeaZ8HUmSVG7pcchf3M+BT aig/MKP7Dl/tZPMyIE1H32A3Gk1G9D0PbxAuxrGgvdHQmgNR5NGTn2iuXyh9yRm8KPxr ERp7yaVebzLfp6SYlsmBrvB5ydbjHh+dPtcWWiuDBDhNSikorzghw+wBT3BoWya7pew/ /4vJS0TMM2idizKneYckz/nJIg9/cpcfIyO0OKxfqPw1284pu6+qcqwLPDOnE2oiEuqG YGFxzFIRE4WOeCegOd5t8awV7DDa4nOFPuGQV32N9266+xuu1+Zt7bG9mb5ibE8gpHyZ Zbsw== X-Gm-Message-State: AGRZ1gKSW11PEN5oKBbr1lTPj5Rq8OQpwGblOq7oamLf8kt1hsYPydSu lSfh5EBkH3RwdQFY8Ph6xjYIcSuH9PI= X-Received: by 2002:a5d:4306:: with SMTP id h6-v6mr24623848wrq.189.1541507073529; Tue, 06 Nov 2018 04:24:33 -0800 (PST) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id f67-v6sm1601114wme.22.2018.11.06.04.24.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Nov 2018 04:24:32 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 6 Nov 2018 12:24:29 +0000 Message-Id: <20181106122429.24563-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH] pseudo: fix link with new sqlite3 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 If sqlite3 is built with FTS5 it uses log() from libm, but that linkage is lost if we manually statically link so explicitly link to libm. Signed-off-by: Ross Burton --- meta/recipes-devtools/pseudo/files/libm.patch | 33 +++++++++++++++++++++++++++ meta/recipes-devtools/pseudo/pseudo_git.bb | 1 + 2 files changed, 34 insertions(+) create mode 100644 meta/recipes-devtools/pseudo/files/libm.patch -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/pseudo/files/libm.patch b/meta/recipes-devtools/pseudo/files/libm.patch new file mode 100644 index 00000000000..1a82979313d --- /dev/null +++ b/meta/recipes-devtools/pseudo/files/libm.patch @@ -0,0 +1,33 @@ +If sqlite3 is built with FTS5 enabled then it links to libm.so for log(), but if +we statically link to libsqlite3.a then this linkage is lost. + +Work around this by always linking to libm.so. + +Upstream-Status: Submitted +Signed-off-by: Ross Burton + +From 4633a8750f0966621d258548fba82bc6aa5aa997 Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Tue, 6 Nov 2018 12:13:17 +0000 +Subject: [PATCH] Makefile: sqlite can need libm + +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index ad6541b..28b5ecb 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -73,7 +73,7 @@ WRAPOBJS=pseudo_wrappers.o + + # needed for anything that links with pseduo_client.o, pretty much + CLIENT_LDFLAGS=-ldl -lpthread +-DB_LDFLAGS=@SQLITE_LDARG@ -lpthread ++DB_LDFLAGS=@SQLITE_LDARG@ -lpthread -lm + + PSEUDO=$(BIN)/pseudo + PSEUDODB=$(BIN)/pseudodb +-- +2.11.0 + diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb index 79e0b6bd21a..c9a4ecd2e23 100644 --- a/meta/recipes-devtools/pseudo/pseudo_git.bb +++ b/meta/recipes-devtools/pseudo/pseudo_git.bb @@ -2,6 +2,7 @@ require pseudo.inc SRC_URI = "git://git.yoctoproject.org/pseudo \ file://0001-configure-Prune-PIE-flags.patch \ + file://libm.patch \ file://fallback-passwd \ file://fallback-group \ file://moreretries.patch \