From patchwork Mon Jun 4 02:48:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Kuster X-Patchwork-Id: 137612 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp966569lji; Sun, 3 Jun 2018 19:49:41 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLlCkgCbz+LrtSOYr2PLdiEbtdO3PD1MWp8g7/xHa2T0kKpLD+TfWNOe0kLQbwFp5xU/7iO X-Received: by 2002:a17:902:42c3:: with SMTP id h61-v6mr20050941pld.164.1528080581167; Sun, 03 Jun 2018 19:49:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528080581; cv=none; d=google.com; s=arc-20160816; b=nep8kiimgdHO8GuVnysWNSwMO/H/kRbtWFy9V3QKiJ8My5RRiYTRl9UCl8id4Sop9H 7YiemNttLWDJPgoetm0JfQwAu4zp57uV1uFeobFLgKEuJxG3fAdTjkqzQ/BtX6VEo+/W Qm8jrjTjsBYglxqT5+F3nkOtva7MuYM9rlJ/VWR9AfNyWmHztIIBg2VcYuxOj6TmTf8h d1wk5X+M2DqUK9E7CrLO9RETSs839k3aSdy2iP5AEsQ82ndzZfQcafjn99n+uFVjRqdM 8cQ3Czvb+iynN4dX9jjQTr1RLM0z7LDi/KU7pO3/kJsfsxLWluIos9mTmHBWA29OPpCO pU4A== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=8nSxb38R7BF4d5XJetPo79gM28ZKKJ9nd3oxuNIToxQ=; b=XuC1yTQIUaHv87lWxxMg9ioNBPYMchtPerne1CvXXKUG8EJWgLwDJ/VS3Dk0udT7Gz EuJPxIzii6EhGgQ/DBQJGf9eCaStM9uJCYq2NJWXkGcjVs0WXrQMRtM0Ufd0YLuadbBh 0RnybBmCtt3ue3NkzmNTbVhoN8M4g+KJDvy+AzLsZJGrsnwMu+2bXor083BWnuP44lgF sQUgMvtoVmirm2KGbIY78HBdC9OVShSFBukev4eNuFkdkgPkYdeXs0EGo/kNkaeKztxO N4O89FChXgbPcfkP9nGjmuJT3JJM+UZaVTs1y9bM/elr77NFJNtrXTraPSKIPXnV5I/J LxJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=rq2FdehO; 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 r9-v6si23389277pge.1.2018.06.03.19.49.40; Sun, 03 Jun 2018 19:49:41 -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=rq2FdehO; 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 layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 807657513F; Mon, 4 Jun 2018 02:49:10 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl0-f65.google.com (mail-pl0-f65.google.com [209.85.160.65]) by mail.openembedded.org (Postfix) with ESMTP id EF89674C00 for ; Mon, 4 Jun 2018 02:48:59 +0000 (UTC) Received: by mail-pl0-f65.google.com with SMTP id az12-v6so18738719plb.8 for ; Sun, 03 Jun 2018 19:49:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=NcG7rWS6xE69r9kuWdvknZguKeSovJCaD+bU/qiv3tI=; b=rq2FdehOE+GkNp/pgu5tpbSDHyKkB+i0Vn9bUTtEK9oJGGqTMAgW04ADQLKDlYLASA dLqbJfJHWPfKonR4bOrP5BASLxh8cpUcJihr8IiO8udxSUzAdd47JM4f4JY8NjHvodzD qQETflKJvyAskg+pMdmtOhQ6pWWZaJ93M/88KJQ+hTzt5ZGZVCFLhZCZLA4p4IiOpTeK ApLviLpukCTr9FsddTH26/W8GpL94R1zr91J05kdRmSnh6/AftNx4QlnMZ/LWbDWFi+G 9clJHmP86F9aIu7UWDhD5Y1W1EKHjyPU75wPR4Gws33rly5iR0b37nDDwo/hx4K1Q2Q6 G57w== 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:in-reply-to :references; bh=NcG7rWS6xE69r9kuWdvknZguKeSovJCaD+bU/qiv3tI=; b=N/wf8RVt2d2jnMGpiJC2zFcCOxtRpN9UmXz+R5YEcBUL7hUZmTg5i7n4PMcP4z1DUS mOxCBSSkcmakEFOoL1xMr8//OEZ/O1a4HU09FPkiUAU08f0f+3FwdFyCF19omWU/nE2R Y4GODQ8vHZdb68lJwAuz1j0mi777VgFOafOIhdD2N1EKDpxQfHpAOAoNwOc6cJK+QdKz CdZnh+7+WQwiGYpqZgOEzMAYetUZmlv/D/feY0k+4q0NvcnYUyxSeHPMfQwi4otBfBig TXLLqgY8XwP/iY9ITPBEF+1/L04fGwUnGyQWlCGRYyqtE2TOzyCxKDKPZzOIJ4HEOIFU /V/A== X-Gm-Message-State: APt69E29w9JvFTHpRD//SyEZD6HueDqAkRqBX8spA/sQURttfTt3RZMh CmoDy9HiK4uBuPBKbEZ6r08= X-Received: by 2002:a17:902:9f84:: with SMTP id g4-v6mr2479714plq.339.1528080541226; Sun, 03 Jun 2018 19:49:01 -0700 (PDT) Received: from akuster-ThinkPad-T460s.hsd1.ca.comcast.net ([2601:202:4000:1184:f1bd:c539:22b:bbf1]) by smtp.gmail.com with ESMTPSA id o10-v6sm62844021pgc.80.2018.06.03.19.49.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 03 Jun 2018 19:49:00 -0700 (PDT) From: Armin Kuster To: akuster808@gmail.com, openembedded-devel@lists.openembedded.org Date: Sun, 3 Jun 2018 19:48:39 -0700 Message-Id: <6bdb28523bfbb555debad92ffb2f09088e4310b5.1528080420.git.akuster808@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: Subject: [oe] [morty 05/15] mariadb: Do not use ucontext_* APIs with musl 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: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org From: Khem Raj musl has ucontext.h header but does not implement the APIs Signed-off-by: Khem Raj (cherry picked from commit b545c0643d2b2a1f1a816e789ff67116c613de5b) Signed-off-by: Andre McCurdy Signed-off-by: Armin Kuster --- meta-oe/recipes-support/mysql/mariadb.inc | 1 + .../mariadb/0001-disable-ucontext-on-musl.patch | 28 ++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 meta-oe/recipes-support/mysql/mariadb/0001-disable-ucontext-on-musl.patch -- 2.7.4 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-support/mysql/mariadb.inc b/meta-oe/recipes-support/mysql/mariadb.inc index 689b8ab..f3eb4c7 100644 --- a/meta-oe/recipes-support/mysql/mariadb.inc +++ b/meta-oe/recipes-support/mysql/mariadb.inc @@ -16,6 +16,7 @@ SRC_URI = "http://downloads.mariadb.com/MariaDB/mariadb-${PV}/source/mariadb-${P file://configure.cmake-fix-valgrind.patch \ file://fix-a-building-failure.patch \ file://change-cc-to-cc-version.patch \ + file://0001-disable-ucontext-on-musl.patch \ " SRC_URI[md5sum] = "fca86f1eaed2163b4bdce4f98f472324" SRC_URI[sha256sum] = "e142f9459507b97c5848042863b313ce70750118446bb4e35e5c07fe66007293" diff --git a/meta-oe/recipes-support/mysql/mariadb/0001-disable-ucontext-on-musl.patch b/meta-oe/recipes-support/mysql/mariadb/0001-disable-ucontext-on-musl.patch new file mode 100644 index 0000000..60e9199 --- /dev/null +++ b/meta-oe/recipes-support/mysql/mariadb/0001-disable-ucontext-on-musl.patch @@ -0,0 +1,28 @@ +From 5bc3e7ef9700d12054e0125a126f1bb093f01ef9 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 26 Mar 2017 14:30:33 -0700 +Subject: [PATCH] disable ucontext on musl + +musl does not have *contex() APIs even though it has ucontext.h header + +Signed-off-by: Khem Raj +--- + include/my_context.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/my_context.h b/include/my_context.h +index dd44103..9b28c17 100644 +--- a/include/my_context.h ++++ b/include/my_context.h +@@ -31,7 +31,7 @@ + #define MY_CONTEXT_USE_X86_64_GCC_ASM + #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__) + #define MY_CONTEXT_USE_I386_GCC_ASM +-#elif defined(HAVE_UCONTEXT_H) ++#elif defined(__GLIBC__) && defined(HAVE_UCONTEXT_H) + #define MY_CONTEXT_USE_UCONTEXT + #else + #define MY_CONTEXT_DISABLE +-- +2.12.1 +