From patchwork Wed Sep 19 18:55:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 147044 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp1063823ljw; Wed, 19 Sep 2018 11:55:58 -0700 (PDT) X-Google-Smtp-Source: ANB0VdbwGq27hn3qvFknj2tEaF4IU4Dk66VEkEx0Jb2n80uT4QtJwqtpEwCcoGTbNq3JF/RTcOuS X-Received: by 2002:a63:2fc6:: with SMTP id v189-v6mr33603367pgv.61.1537383358107; Wed, 19 Sep 2018 11:55:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537383358; cv=none; d=google.com; s=arc-20160816; b=QYb70yH+t9Mz7y9GTViW4Yd3hOQB2QVUR9KHNguJaF6ucyHvgSdF9NZNUf/G8iebjv foIgL4osf8XMMG2aGhIk9RZhaaJajqwXj6lyehcy+RFdQ3Z8jF43ZCt2XgH/lU2PglLV Z3FneckP++OtukiEqUYzaaJmV1sMFnVgb+ZZfiSIyzsGnfXVMQJN6vC5Gy4YIBRycT8B 1LzicbxlnxsWLiDBLHfxSHBLyHPrL9KtDF1+BUlZYAxnTYIuTBYRfTN1kwFNpdKWT+aH YLIXXjrI0Vzz9JNra7PVKtUerL2HTamIfw7B8RhbPcYB4kd7LQA/VMDQflsOH9FPAPSh Ef2A== 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=8NN+FglXQejxFxqwHR4/regU0j9nis2YvLr3+zoDXkM=; b=JLM85mPvijcpD4hfBWRPwfu3tsCLeRLVLJ4/sKCEr/CJn+ATMbom2ib31clWkw+ZmJ FDkWg7VHli9a8sBxmQnOiki8d1E7djDDrCeow/TXk3i4SlZ5T3VmDRaRqa7k0jicHbyP mZfH86Wk1A3/wTyyPZ1hE3cf3K5qkzpLEBgtjNS1eivmCKvAd8voifpqVixB4yJLaYmm Zn3HJ5+3gp8aQgnBKioPhQhxu4KJrnAVLQkSTjz90gOeXOA0aj7Ln5dT547ROYQamx0f 4mDGqnipVuQjRSJ6zAiHsUihSsBXkAL/crzUQyqAsXZHOKX7/NemdxfF/VbIYCeYyzND 9pdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=veHqE+ae; 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 l185-v6si22933972pfl.134.2018.09.19.11.55.57; Wed, 19 Sep 2018 11:55:58 -0700 (PDT) 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=veHqE+ae; 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 layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 54ABE79711; Wed, 19 Sep 2018 18:55:54 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by mail.openembedded.org (Postfix) with ESMTP id 241A974AFA for ; Wed, 19 Sep 2018 18:55:52 +0000 (UTC) Received: by mail-pl1-f195.google.com with SMTP id w14-v6so3087169plp.6 for ; Wed, 19 Sep 2018 11:55:54 -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:mime-version :content-transfer-encoding; bh=lE7zo6QGoCcYuC63T7S7LHCh5Rg2ff/CPjPCbZA1ztM=; b=veHqE+aepQIvpdJk9PVrqFjiP0KVphgx65FQ+GFxMFjWvxuOH3gA2gdX/BLd1+1aHa vbyB3L5cgebGQuNL4wT8lgux1jpHwqqI/hJasQeEw3LGVd6SaEzLrCKOdPicrc1MK6U5 A5dn8aHyEGrj/ZaAePxLsx9Zvj2DWQiDzwzNK0xoc+g4PaC/vQuTAfzBmfQIItJZMhTy DeAX7pxx8T0Bt8Bt5+vDmozFrH+gFCW+WlkLQ5upeff0AreJkGnAOflHYKXWKAWC0jLS P0puNAHDt3c6j/e9Gm2fSLXI6I96bbv9OcpxSZt040ruhP4NqRlqUBDDIZ7op6j6tZeF ijnQ== 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=lE7zo6QGoCcYuC63T7S7LHCh5Rg2ff/CPjPCbZA1ztM=; b=sE1922ce6mfFPlRVqF3mZ+hfzoEyGa144+2e1aZU5lKD3tyRlboWAnIIqoDP4enZBD s9aJ9VZa/cHXUZ9XyhLtbKOPyEn5hL1YeMsTyQk+gPGrbqHMvlKEY0r4TO18uvNf1NF1 0OsYhuLeR0IWaE1BoPctSNBq/fi3Jtkpb35XUQYZ63rmvj+xe0VCD+SpETZ4PLjvXmJZ cwi503oNQJHYVwXzbCTt/eFRRmFiMcQd3zHhH9q5V78ryq3NV5+2oJtaFVTmhNHN8Yt3 /oo6xkAJ0Lh7eP+6WfC5trB5foPdEpC10WqyKJgaVDGEwNaWWsLLKRGQ1hJyN0yZDpMB 4jEw== X-Gm-Message-State: APzg51A4RSi5l+pOBM3q4cmO6RPuy7lG/AFjgVy2L/IAEPAW6yaq0EWx BeUqxALD7+a3c7nn3Mp5MfOHOIsV9XI= X-Received: by 2002:a17:902:7e45:: with SMTP id a5-v6mr35958053pln.151.1537383353604; Wed, 19 Sep 2018 11:55:53 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::b1b1]) by smtp.gmail.com with ESMTPSA id y3-v6sm35687083pfi.24.2018.09.19.11.55.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Sep 2018 11:55:52 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Wed, 19 Sep 2018 11:55:41 -0700 Message-Id: <20180919185542.2329-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.19.0 MIME-Version: 1.0 Subject: [OE-core] [PATCH 1/2] mtools: Fix build with clang 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 Identify with __clang__ to undefine UNUSED Signed-off-by: Khem Raj --- .../mtools/mtools/clang_UNUSED.patch | 17 +++++++++++++++++ meta/recipes-devtools/mtools/mtools_4.0.18.bb | 1 + 2 files changed, 18 insertions(+) create mode 100644 meta/recipes-devtools/mtools/mtools/clang_UNUSED.patch -- 2.19.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/mtools/mtools/clang_UNUSED.patch b/meta/recipes-devtools/mtools/mtools/clang_UNUSED.patch new file mode 100644 index 0000000000..6bb9d6a3da --- /dev/null +++ b/meta/recipes-devtools/mtools/mtools/clang_UNUSED.patch @@ -0,0 +1,17 @@ +Undefine UNUSED macros with clang + +Upstream-Status: Pending +Signed-off-by: Khem Raj +Index: mtools-4.0.18/sysincludes.h +=================================================================== +--- mtools-4.0.18.orig/sysincludes.h ++++ mtools-4.0.18/sysincludes.h +@@ -101,7 +101,7 @@ typedef void *caddr_t; + #if defined __GNUC__ && defined __STDC__ + /* gcc -traditional doesn't have PACKED, UNUSED and NORETURN */ + # define PACKED __attribute__ ((packed)) +-# if __GNUC__ == 2 && __GNUC_MINOR__ > 6 || __GNUC__ >= 3 ++# if (__GNUC__ == 2 && __GNUC_MINOR__ > 6 || __GNUC__ >= 3) && !defined(__clang__) + /* gcc 2.6.3 doesn't have "unused" */ /* mool */ + # define UNUSED(x) x __attribute__ ((unused));x + # define UNUSEDP __attribute__ ((unused)) diff --git a/meta/recipes-devtools/mtools/mtools_4.0.18.bb b/meta/recipes-devtools/mtools/mtools_4.0.18.bb index 91f7b7c610..3c31aca3ad 100644 --- a/meta/recipes-devtools/mtools/mtools_4.0.18.bb +++ b/meta/recipes-devtools/mtools/mtools_4.0.18.bb @@ -32,6 +32,7 @@ SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \ file://no-x11.gplv3.patch \ file://0001-Continue-even-if-fs-size-is-not-divisible-by-sectors.patch \ file://0001-remove-LOCK_NB-to-use-blocking-request.patch \ + file://clang_UNUSED.patch \ " SRC_URI_append_class-native = " file://disable-hardcoded-configs.patch" From patchwork Wed Sep 19 18:55:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 147045 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp1064040ljw; Wed, 19 Sep 2018 11:56:13 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZudU4gH3hAoZDt11VufoWkVlRnqL+ydtoy8doSUCNgVOIJlpt583tXVZdOfmQjt2EB2//x X-Received: by 2002:a17:902:468:: with SMTP id 95-v6mr34648976ple.122.1537383373302; Wed, 19 Sep 2018 11:56:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537383373; cv=none; d=google.com; s=arc-20160816; b=FT7/Xh2ilMucla0/QT9T91HQAED0jkqzV7inoo4v743fJncOo+d0zWiQeWQyDHTDjG gDBahSuXzXxA30ejqIquY7/AZ8ZD/HHJjuyCRmSdE2fT+x+Y2p7of8x5EC6or/FpuaEC 4arIEiHDcQ2zHBS6GJ6PCOLmAid8dNOrXThhf9zFq8P6AzKElyn3nQvTtvTsrCe3Dv+1 ve4zoKynpk9J6IKsYP7+Iw1zjePbz3KPGLF/MGSfycSS2GQZ39OqQs41/z2CIkB3o/WV qlgXRHRubJdzdd+dSeVa13+61v/Bnz0ErLl716swKGvRXlGv68Ym6/Rz2mQcHpoON7ix Ptng== 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=62vd00tf4lbqMRHXnd18L/hAbm6DbeknCi0LvLCI7zc=; b=oK87IaQ9zyLS9EIx9S1dDWQh6+JrKQ2QuBrxsrFnbfOPhFoYKINowwYLy2js80ZgkY n6eqiJYjnBkySyYdtyIpF4scMMEoEeDKAbecHzAVwQ3tYYd/yf6wOz+tLzZFdqY+nFXu UTYGqupmhWTWMzdyWCsiHJSMONrfrEamzE7Nxk9CZ5cXUaOP+/B6ji5kMCjHmd8XdPQk y6Zfue/6yqat4nUvIRgG7d93vPOqo0Au1sRZH02NJpeHGIRu5znFqHKJlF2zqyzE3mSC Wiz0DRLLZKSyRath797wBd4OjJGQw4C5stZiBva2r6ZQ/jwTchieuhfL8ZS3Bpx3PatZ Vg8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="N1/Wqyfa"; 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 m124-v6si23592455pfm.303.2018.09.19.11.56.13; Wed, 19 Sep 2018 11:56:13 -0700 (PDT) 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="N1/Wqyfa"; 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 layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 6871B7971C; Wed, 19 Sep 2018 18:56:10 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by mail.openembedded.org (Postfix) with ESMTP id D9A2974AFA for ; Wed, 19 Sep 2018 18:55:53 +0000 (UTC) Received: by mail-pl1-f180.google.com with SMTP id f6-v6so3098434plo.1 for ; Wed, 19 Sep 2018 11:55:55 -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=3QumaT3vJl+TFq2x6e9xein3ZzHAIAqbTZWlpOIpmrw=; b=N1/WqyfaWqz10feEDIGyNnWM2QU8+I8dDrY5wrCqslUGcpn9sXWucYjxzQ2CwZIG/f gDcfESu1jZn8t4vOEWTs7c/hL4MTDRdLieAaIc/I9/eOyK1VIx+krfvkTpM509xlP9/U ywt/LEHnQMhQHt6uOBaViEnOl/2oGAFHL85akRjrvtVV8ZPfSfL1JWtMrVyzYJqi43uC 7jbohLh8gzQK5rY0FyDAB8t61IRiFHePDBUMXESNUfrM96X1q2R/TPXPAaeZafGbFnJi RhBoGp9qN6T83oGI+GfNWFF1v3EAAYe7GTPJ51UvN9rN+CZMW9lfl+mzsdQrOpX3Ipc5 6Zdg== 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=3QumaT3vJl+TFq2x6e9xein3ZzHAIAqbTZWlpOIpmrw=; b=T/7YqY3F8Vg2nLZICOJW1TmiVUKIKSOmmepz3SGHvptfOLtC7VpEkcoaqKGlO202QK 2cMAxX8y6lrdAbb6Yz3npHeTqMONDb64a4jYDuyGXs3fW7XdFrfZT6lZazeUR2kriLlZ 94TERDGTEzuHlhTxX5GYAuJTjrnTGS0dAls3gP6xS78TAdcnSb8fAN9+MzXLIlzv6LeM dlEYfkJKH2NGqK9YdMM3GDNpljBDVw3f2fh3xAJYqc5a96aicvTy/ZjeMW9Y18dDnFuI POm6iA9FmLCcclWo0bGP6bUUEsSrm7bIaSqv89z+RAjHnO8EXFnPP5oFgCKfmKsLgFoM 3X3A== X-Gm-Message-State: APzg51DFsd9bedoRbG92WjacagsJp6SbO/9YLkGN0/ffflRw/50QzJNf GyNtGTOuK1Xh/iOsv/LC3cRFxqL0G7A= X-Received: by 2002:a17:902:b189:: with SMTP id s9-v6mr35558446plr.188.1537383354450; Wed, 19 Sep 2018 11:55:54 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::b1b1]) by smtp.gmail.com with ESMTPSA id y3-v6sm35687083pfi.24.2018.09.19.11.55.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Sep 2018 11:55:53 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Wed, 19 Sep 2018 11:55:42 -0700 Message-Id: <20180919185542.2329-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20180919185542.2329-1-raj.khem@gmail.com> References: <20180919185542.2329-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [OE-core] [PATCH V2 2/2] musl: Add aliases for glibc provided libraries 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 This is a step towards running pebuilt applications for glibc on musl There are many realworld applications which are not always built from source, especially provided by third party Package the glibc symlinks into new package musl-glibc-compat Signed-off-by: Khem Raj --- V2 - Package new symlinks into separate compat package meta/recipes-core/musl/musl_git.bb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) -- 2.19.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index be31718e3a..efdf620c6c 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -26,6 +26,14 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils \ bsd-headers \ libssp-nonshared \ " +GLIBC_LDSO ?= "ld.so.1" +GLIBC_LDSO_arm = "${@ bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ld-linux-armhf.so.3', 'ld-linux.so.3', d)}" +GLIBC_LDSO_aarch64 = "ld-linux-aarch64.so.1" +GLIBC_LDSO_x86 = "ld-linux.so.2" +GLIBC_LDSO_x86_64 = "ld-linux-x86-64.so.2" +GLIBC_LDSO_x32 = "ld-linux-x32.so.2" +GLIBC_LDSO_powerpc64 = "ld64.so.1" +GLIBC_LDSO_mips64 = "ld64.so.1" export CROSS_COMPILE="${TARGET_PREFIX}" @@ -62,12 +70,26 @@ do_install() { install -d ${D}${bindir} rm -f ${D}${bindir}/ldd lnr ${D}${libdir}/libc.so ${D}${bindir}/ldd + lnr ${D}${libdir}/libc.so ${D}${base_libdir}/${GLIBC_LDSO} for l in crypt dl m pthread resolv rt util xnet do ln -sf libc.so ${D}${libdir}/lib$l.so done + for i in libc.so.6 libcrypt.so.1 libdl.so.2 libm.so.6 libpthread.so.0 libresolv.so.2 librt.so.1 libutil.so.1; do + ln -sf libc.so ${D}${libdir}/$i + done } +PACKAGES =+ "${PN}-glibc-compat" + +FILES_${PN}-glibc-compat += "\ + ${libdir}/libc.so.6 ${libdir}/libcrypt.so.1 \ + ${libdir}/libdl.so.2 ${libdir}/libm.so.6 \ + ${libdir}/libpthread.so.0 ${libdir}/libresolv.so.2 \ + ${libdir}/librt.so.1 ${libdir}/libutil.so.1 \ + ${base_libdir}/${GLIBC_LDSO} \ + " + RDEPENDS_${PN}-dev += "linux-libc-headers-dev bsd-headers-dev libssp-nonshared-staticdev" RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev" RPROVIDES_${PN} += "ldd libsegfault rtld(GNU_HASH)"