From patchwork Wed Oct 4 18:51:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre McCurdy X-Patchwork-Id: 114805 Delivered-To: patch@linaro.org Received: by 10.80.163.150 with SMTP id s22csp6259451edb; Wed, 4 Oct 2017 11:52:16 -0700 (PDT) X-Received: by 10.101.73.198 with SMTP id t6mr19401815pgs.382.1507143136103; Wed, 04 Oct 2017 11:52:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507143136; cv=none; d=google.com; s=arc-20160816; b=Y40simr+enEJmBGCmye2xt/+CvHFuzGc5NH/dwWKmjjp87KH6Ykw3v2uQSO8lIxgNM BA95VabFbiRE34uHd4KI0/8ydNBwnDmbtEMSLcGTZsXApf0KuIqHpss53rOLcWKy5QIO EkiXS4zGqLdU7jC7PQd0WhBBAkPPpY4FpdicNUaQ8OHs/MBgxOqSHPBUPmAxviW4vCHO l+FjH/yJrH0Rq2/bAxOZqwCdsvKY1tmt3YVheGkqzJTmmlKpBl4U+CAnbzdKHd8W0fHa 6j7lg/n3Dg/lNeCE6qD2Oi9UCY849IjRT37QNiYxdnAz2+SZ7bzLBQU1H4Pr10N8mWAH tJZA== 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=NDAQWnoGcepiObT7YuSdtb2fMQL9vLVaXFYEPTXzSfQ=; b=ckv5B8h4BntlKJ9tgP/Os8Qr/8SNzQ83v8yRpwZD8gz6IC01Y3kC+YQRFjXV+Mrdry pKR13H8OxOVQFO2qdE4HPgjc0TIgbFvJurVVvxiwvjP5HCxOOA+++V7HAFW7BpERG7Qn /Zx/xJ3X6zrr4dfyh/6HjCTChxiLgScN7posFB1rrhS1AI/TMaC8+adTQ5In6wpkc8/D drzcNHZzncsrrG46LoJ8qNiV3So2YMhG2CeKathVbEyYVghR5zhjvVYPej2yc4DIPJZV 6vMLQzz29H1pGvorrHQtzMDVB0/SqrNI51pE0AwBYR7F+uqNfjZA7WiaW2A235nTKkRJ CiJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=iJoxR7yU; 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=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 43si12811771ple.604.2017.10.04.11.52.15; Wed, 04 Oct 2017 11:52:16 -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=iJoxR7yU; 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=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 B3EDE77EFE; Wed, 4 Oct 2017 18:52:10 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by mail.openembedded.org (Postfix) with ESMTP id CDA0E77ECB for ; Wed, 4 Oct 2017 18:52:07 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id e69so12968475pfg.4 for ; Wed, 04 Oct 2017 11:52:09 -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=j6V7JRd8Am/aX4iV6UdBwqk6Y0+lar5mH8gC4Sjh+mA=; b=iJoxR7yU41XulHz1ZKFCh+DVv2In/plH5zxF2hmT40HHdyfM+RPvzxCmZaKRjW51ef oVQiHQjeCfpTreJ9S5iwsq3xVxgssmGu3vdCeYrDaQVygC6DIlFCO5dSl8/CmG1UweN9 2QF9J4c6cCTNvA5xsOoABgyrPFxaqxQY6R/rRi6lHP/+xPs72aYzISGXEcC+QvFgxmos KoPP/BKiuug0ggpmWB6bxYqaorPlpUIPX2qrlg7LLRBb7GyZfTrCjxq02jONx3fshY8T ekBNtjXeCZS2em6MSjqrAUu6yc84dJrQvIJsdRQt7LDnq/iF62NAuiBS+P/ptcPaCSmB U58w== 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=j6V7JRd8Am/aX4iV6UdBwqk6Y0+lar5mH8gC4Sjh+mA=; b=VlHeHvsHS+XbMoX3p6cL5ClqrvUM2Umlx6/gqJ5JAjCq17Ono5xvxxw1v02rv0qRcx rH0O9QIw/8+5ItKb20R7VBnCKkTwf26boT3X/PMl9GqUg8489iFIv8RNMfXOH+zviyII d6/LLLn5JIoo21YjoqPqc0RE++ODrkmccizfHbvs3yGY9fC37oH/JT5oF3CM4IfuGR+V ce72xAQB8Vdkxt0kPOSiKCYPLphRp96eokc4iSiZg/YP9acqTY7I6i1ju1kveTFZ57Oz HGMfXR3XcZ15fKSX7DBmfvuBm7PGrLJ/02F7EnYKakjnaxQAX89jOc3uMgcUM6J9SZvw lRnQ== X-Gm-Message-State: AHPjjUg1jwSK/LfFhDrhMO/VQ+c5VpyiWBlVWjJczedKMF7HcsFm9i0u G51jEbbxL/+5JxPtpeIvtS8xmg== X-Google-Smtp-Source: AOwi7QBhhIerjUql6NiO14Ari3rbnnRFdyWrh/xvB5pa+orjWgn1PLHuLHQ/Vg02/0STq+lEyy3rfA== X-Received: by 10.101.81.1 with SMTP id f1mr19748675pgq.204.1507143128644; Wed, 04 Oct 2017 11:52:08 -0700 (PDT) Received: from e6520.guest-wifi.scl.liberty.com ([4.16.80.121]) by smtp.gmail.com with ESMTPSA id 5sm7558875pfe.128.2017.10.04.11.52.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Oct 2017 11:52:07 -0700 (PDT) From: Andre McCurdy To: openembedded-devel@lists.openembedded.org Date: Wed, 4 Oct 2017 11:51:58 -0700 Message-Id: <1507143118-9319-1-git-send-email-armccurdy@gmail.com> X-Mailer: git-send-email 1.9.1 Subject: [oe] [meta-oe][morty][PATCH] 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 --- 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 -- 1.9.1 -- _______________________________________________ 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 +