From patchwork Tue Jul 1 20:56:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 66033 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C793C8303C for ; Tue, 1 Jul 2025 20:57:08 +0000 (UTC) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mx.groups.io with SMTP id smtpd.web10.8016.1751403425161452495 for ; Tue, 01 Jul 2025 13:57:05 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=NDafuKV/; spf=pass (domain: gmail.com, ip: 209.85.214.169, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-2353a2bc210so34807785ad.2 for ; Tue, 01 Jul 2025 13:57:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751403424; x=1752008224; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=UpmFxL75X8/uVd/bKt4scZ2OoIS/RttY+ftFM5SFVus=; b=NDafuKV/Qa7YJV2AwbyBQyXRb3L+Zy0QXc66U/TR4cnkJoG8uwSzhK/UOfbn4CJFC5 WoWsz/QM0acbgU7Gg2s9gzyVJ0JIHnzTnH0vDfgjyDHaCyRMvb6z84fzIA+wrcTlquvi XMM1w879PPxwJ6Qz4X+bJCHe1C+h6N/IfJJkH6lpVCr8M90T+Q4fa/cGyqLCHvJlXUeJ tm9RSz3FXBJwfH44+MrolZlLc9mNRWCkWXqBd6XEVVFYwnDEHonnwlYsKN9J1Zh/mR9H Cmclw467SuVsGN9O8d4a/hAwz7jVQC3JT+Ei0Tb2DQSty0XjKwa9JyR/zWcSXHdibAj2 kHdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751403424; x=1752008224; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=UpmFxL75X8/uVd/bKt4scZ2OoIS/RttY+ftFM5SFVus=; b=czchvCduQpdxa4BpvMNR850/nwXfP5i5+ccu9CjhXOx28COOfoM3dx/iNwR48v24hq Z5jZdW8ZOJ9pWmxjYi0BkSULdwSAwJHyIBlScDbOdnzH3ZmHp9Ohzn2G/yej+gFchUsB /SsHxycWzwzAVQ3ao0kM6whrqBQExswHvO14nP6tXe8PjdFqdP7nQ9oITmUSQNZgqxuD nkuN47saJdx7FPad/0l6EW11PhDnzulwk4nFieSwV0P4vkuEnh4IQjZOlNCNgJ8GRfa2 P0+mg8TNUEjDG0KPw9bZjmeQl42rX5tw4bxt0ebe7XzTrhVf8/C3sk4NPp03VPhpm685 M3qw== X-Gm-Message-State: AOJu0Yw2T4X3WoPbck/t2h086F993qrRiYDYwoe5eqPbGbrw/juxezae Jx8C3xS4/vGxmo2xHbbW0zZSngnZepqDVCqZMC+8MdVcPFzSNusk1GAxlsrK/Jv5 X-Gm-Gg: ASbGnctHJzy3ldaBSR0hXx/BBwu74vZEaziVj9qzhWZJUAsT7e/HLUy2h1u6XWqLWkU jtOMZuDQYU6SUg3tQiAlHCg8t8gR4IZFlHzeMRx9Htv5C0bQqBCQIv4RHsXsRwqtsi/dBAKJP/U qzhDn4jtuDNri5b5bW4Br+Nnlw0APMNGl8fSFdKFaTFtY/UNqWWSv9gOhPIj/yp9vUyVSo3i0K6 5AuwDE/C26XRfohq3bP107kjdbQ23+gLS6OlY6bj1JE/d/+t2TDm0ZPG0Xo2rHRby970fmITCXE pCXKQ4MMTYyzNxuGKQN6FXuDEI25TXgJYjSQDO8F9qnA2ku1Jrext91lhKXY3llI X-Google-Smtp-Source: AGHT+IG5pSwatMKGYTVOVAc8cH6L3Jru/d5RNue/S6R0Z394XsM+3wM934NuEp3bOludhPm2UoWLZQ== X-Received: by 2002:a17:902:d492:b0:235:e1d6:f98b with SMTP id d9443c01a7336-23c6e4cb8e1mr2590155ad.22.1751403424234; Tue, 01 Jul 2025 13:57:04 -0700 (PDT) Received: from apollo.localdomain ([2601:646:8201:fd20::aa8c]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23acb3c7028sm111549705ad.222.2025.07.01.13.57.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Jul 2025 13:57:03 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj Subject: [PATCH v2 1/3] clang-native: Add class to use clang as native compiler Date: Tue, 1 Jul 2025 13:56:59 -0700 Message-ID: <20250701205701.3322308-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.50.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 01 Jul 2025 20:57:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/219721 Some recipes demand full clang/llvm builds e.g. chromium we need to use clang as native toolchain. This class collects all needed bits to enable OE built clang to provide the clang native toolchain Setting PREFERRED_TOOLCHAIN_NATIVE = "clang" in recipe will chose clang for native toolchain Signed-off-by: Khem Raj --- meta/classes/toolchain/clang-native.bbclass | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 meta/classes/toolchain/clang-native.bbclass diff --git a/meta/classes/toolchain/clang-native.bbclass b/meta/classes/toolchain/clang-native.bbclass new file mode 100644 index 00000000000..adb22883806 --- /dev/null +++ b/meta/classes/toolchain/clang-native.bbclass @@ -0,0 +1,18 @@ +BUILD_CC = "${CCACHE}${BUILD_PREFIX}clang ${BUILD_CC_ARCH}" +BUILD_CXX = "${CCACHE}${BUILD_PREFIX}clang++ ${BUILD_CC_ARCH}" +BUILD_FC = "${BUILD_PREFIX}gfortran ${BUILD_CC_ARCH}" +BUILD_CPP = "${BUILD_PREFIX}clang ${BUILD_CC_ARCH} -E" +BUILD_LD = "${BUILD_PREFIX}ld ${BUILD_LD_ARCH}" +BUILD_CCLD = "${BUILD_PREFIX}clang ${BUILD_CC_ARCH}" +BUILD_AR = "${BUILD_PREFIX}llvm-ar" +BUILD_AS = "${BUILD_PREFIX}as ${BUILD_AS_ARCH}" +BUILD_RANLIB = "${BUILD_PREFIX}llvm-ranlib -D" +BUILD_STRIP = "${BUILD_PREFIX}llvm-strip" +BUILD_OBJCOPY = "${BUILD_PREFIX}llvm-objcopy" +BUILD_OBJDUMP = "${BUILD_PREFIX}llvm-objdump" +BUILD_NM = "${BUILD_PREFIX}llvm-nm" +BUILD_READELF = "${BUILD_PREFIX}llvm-readelf" + +DEPENDS += " clang-native compiler-rt-native libcxx-native" + +LDFLAGS += " --rtlib=libgcc --unwindlib=libgcc" From patchwork Tue Jul 1 20:57:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 66031 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9D0D1C8303F for ; Tue, 1 Jul 2025 20:57:08 +0000 (UTC) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.web10.8017.1751403426315269658 for ; Tue, 01 Jul 2025 13:57:06 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=giuSFWuu; spf=pass (domain: gmail.com, ip: 209.85.214.175, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-23649faf69fso33551395ad.0 for ; Tue, 01 Jul 2025 13:57:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751403425; x=1752008225; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TdXxI1PzvtCbloJr31Z+42X2RFFS02EnDFVgioTJXwA=; b=giuSFWuuKiz6AeK+lASn+J7Jxz7AFRPrmU2625y+1Vp63hFexUMNB0lxJgKmoMo/s5 YhUrxyvkOoRrm65QQtWueg695e/4Nk7VRfAldYwHVtHrj70J8ADQYTiMD7JFHhnbtrq8 o2Fi5dQzOWp37YMurkIvki7/kwPNlBtjQnOFxQtKxWB7tPm92gCJRbYE3qBIEY43CQhR 5ZIgmLMaQlPkOep5O4RATabCJL3hYErbA2EYkWx/OGJUQChd/NpCKBgbMEdJhQmiOVak bsCj+waWUyUcBIbe1MW637oaBlaFy+m5L2/SATT6q/e0uaV5bArykon7tamjMAj+dSNZ E/Eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751403425; x=1752008225; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TdXxI1PzvtCbloJr31Z+42X2RFFS02EnDFVgioTJXwA=; b=gT8nuTAHjnOVAd/vVXa7L1AVOGXJGfBOLnRtNARSE0pvvDhahPJ/hBDESuFRXdBRqi LGchZvrkg/N6H5mPlFdFLNxYvTfLJqQ8RMd0DuD/enFTNTmRJ126LVUwqb/BjN+FtCrO UUdkfgiNBNL9p/DPlYw2IlqhZGLQdlvrfuUHoGFglk9DC0ecppP+zUMiSs+Vg+KFH+wl WlHzc48/8SoJmRgqRHeTu24bqCPoswPb+CmxPaQahDlkClET3acwPZt67rjdK0GXW9NA kBmELvO31Gfld/kJaEYHzT9JQVyu322E+SsDpoC1WYQOV/DLFdSQkB3+YSAvs72T9Wfw RVxQ== X-Gm-Message-State: AOJu0YxnP23HIufq/vKWTNGmw3PDpgSI3LW1+FMoaQmvl/Jrnmf1M3rN 8a4wSJ6djLloYc3mi42/Yx412rsYK1Zj71kWrWTy21nH4JYRqF6wGujlxNw7uYh3 X-Gm-Gg: ASbGncsTj+5Khowe05DWAboZ2J9Sst29AhQQM2F8eBGQFIKMK2HEZjgMF2dQHwp04PZ orObqfkJ+QNfIUXD6zknjCpWRJscMD9Ih1WLu68uIh1o0CSRH66GXixiApbKG/WKeMQF0Su/ZAS 81nYgMKE44h+gIwqkgCQevyVowWuQsiECYh6jksB9r1rskFaUpPuWMTfX4RpTizOh5TlPoOO+ll PoGwR2ykbJZQjxFCByzYv3s0EwxQB/IN0Ela8FbLorHA6pEQUYx/+PsuesfFnfEwSBQ4BpeU1O0 j/mH8CqsvSKUDSCVPG+L/4JH1ethCcj8C9TBFPa+3KsTzxDxNogzXc5a8I3SHkF7 X-Google-Smtp-Source: AGHT+IGYJBL9GnJI3hqRD51bniSSqVWD1Vs8MCwDdMiVbbYgP5AqAR8vM5VPPXjwqzmB36cNBEYkgg== X-Received: by 2002:a17:902:ef10:b0:234:d431:ec6e with SMTP id d9443c01a7336-23c6e48b6b0mr2531665ad.3.1751403425367; Tue, 01 Jul 2025 13:57:05 -0700 (PDT) Received: from apollo.localdomain ([2601:646:8201:fd20::aa8c]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23acb3c7028sm111549705ad.222.2025.07.01.13.57.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Jul 2025 13:57:04 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj Subject: [PATCH v2 2/3] base.bbclass: Deferred inherit native toolchain class Date: Tue, 1 Jul 2025 13:57:00 -0700 Message-ID: <20250701205701.3322308-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250701205701.3322308-1-raj.khem@gmail.com> References: <20250701205701.3322308-1-raj.khem@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 01 Jul 2025 20:57:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/219722 use TOOLCHAIN_NATIVE variable for selecting native compiler Default it to PREFERRED_TOOLCHAIN_NATIVE, a recipe which wants to enforce a toolchain can do so with for cross toolchains ( e.g. target, nativesdk ) TOOLCHAIN = "gcc" For native TOOLCHAIN_NATIVE = "gcc" This helps build native recipe with clang as native compiler. Signed-off-by: Khem Raj --- meta/classes-global/base.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/classes-global/base.bbclass b/meta/classes-global/base.bbclass index ac145d9fd64..6be1f5c2df2 100644 --- a/meta/classes-global/base.bbclass +++ b/meta/classes-global/base.bbclass @@ -30,8 +30,9 @@ PREFERRED_TOOLCHAIN:class-crosssdk = "${PREFERRED_TOOLCHAIN_SDK}" PREFERRED_TOOLCHAIN:class-nativesdk = "${PREFERRED_TOOLCHAIN_SDK}" TOOLCHAIN ??= "${PREFERRED_TOOLCHAIN}" +TOOLCHAIN_NATIVE ??= "${PREFERRED_TOOLCHAIN_NATIVE}" -inherit toolchain/gcc-native +inherit_defer toolchain/${TOOLCHAIN_NATIVE}-native inherit_defer toolchain/${TOOLCHAIN} def lsb_distro_identifier(d): From patchwork Tue Jul 1 20:57:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 66032 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B8E3C7EE30 for ; Tue, 1 Jul 2025 20:57:08 +0000 (UTC) Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by mx.groups.io with SMTP id smtpd.web11.7994.1751403427566256504 for ; Tue, 01 Jul 2025 13:57:07 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=WHzCucmA; spf=pass (domain: gmail.com, ip: 209.85.210.182, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-7424ccbef4eso3453951b3a.2 for ; Tue, 01 Jul 2025 13:57:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751403427; x=1752008227; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nLHX7QsjEYrCC/TW+FrCqJ6dzQaEn4LCTb+VjAFcM0k=; b=WHzCucmA1GRYyzpUutnycWWC52iCh3d1tsnXRCmAFpri3LuR3cXEW1Urq3zHbSVFEz KhroY6QKhheSXxJ7+oVT18XEY4d51E8C/Trs77kkiQ75TWXxGfS0ampoY8Ngsw153hA2 YYtiK1kBvnDKcEErC2BJJ8ofn9oqiVSpF43BLGcCwg4C6wvoYpWCqbH3yBCfUn9j4D7h 9Hzoppl39YrowCaxnEABQpO6217ekg2MsnfEv/0oevRZtY5DTL6hX/nSRpU2cL3FtATU Moby2Sil0kdwye5+uqr6RD5NIDcXzGBCEgkUhE/p3ORz9XnK85HdSlyNTLIBXOl+2F1q uogw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751403427; x=1752008227; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nLHX7QsjEYrCC/TW+FrCqJ6dzQaEn4LCTb+VjAFcM0k=; b=i+yswItUfT76oD2AC1wdvHCNYQWPk0CaAoBmo78H3Ez2TxLYbUY4Bzpwwcy2EIAdup lgFRIFEt10sQjgNiW7obI2cQ8pFpqvM5BokYcQP1MJYVmcnTeNuJWBVKn2e4kPwR6ZeW CHvpl4Ed+o5WnvRAFQY0bNYa7oxyVtV2v5wcgwif3sj12gYxGRsh/6sXV6EwTtQqG9BC GxsMBGDQ+cPRQBAc7a8XQ0FMCe4LMZlVwJDYUc7KtA6sDM451Dn9Ynu1ygaubGh7iytB qLQvHqhqfAAX/PdXA8+xeIx44ffn9s5r0XvUbbHpsZZtDWy8d+o5xp7wLqYktdbzq/5V Tf8g== X-Gm-Message-State: AOJu0YyqjZMF2CTA6rsUagHSKFYmme3SyXmy7dA4Uwu7kKBgLKrUimaa Favz6I1dEyljT059HGqfJ9+u+1sWREdcL949IvwdBr17NjF48s3Bka6Fkzq+4NeA X-Gm-Gg: ASbGnctOxYWUE0eBwUIolE4jIybruGHeikg5Lhintx+LGUhYyp2ssOoVU3a8lyoPANI K7mp170MKEAmj/6vfRP0q0FqRR4cNO3xj+N5wTy0Eh6H4G0X/89Jx7kXIjNst8Tfn2RAvhtxgSI b84J+asn9c6O54EJhfQ0RUPnWkCXq/oe52GzcwZFBuNYHW5Kp60An3m13gZK21utjpZmGrzQtnz u98sLKSaEN6yJ1U6M+qTR/5P5qqNHbOoz+eWi8N96i30Bm2So9ASVARApkqODmSGYkq673EpcDP HbtGSNQOg/aHeUDH5RsdvN9htit4UYCrfS0UZiJImA2je9gbcC3Ltg== X-Google-Smtp-Source: AGHT+IGcqFYmHOkCukxpwUqPxNrMFwDZNdLCXI63ww/uX54AqMuO4mFtv6ZjdCJumi8ehR3337bZ8w== X-Received: by 2002:a17:903:1b63:b0:235:e71e:a37b with SMTP id d9443c01a7336-23c6e550151mr2718935ad.34.1751403426475; Tue, 01 Jul 2025 13:57:06 -0700 (PDT) Received: from apollo.localdomain ([2601:646:8201:fd20::aa8c]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23acb3c7028sm111549705ad.222.2025.07.01.13.57.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Jul 2025 13:57:05 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj Subject: [PATCH v2 3/3] Remove oe.utils.host_gcc_version utility Date: Tue, 1 Jul 2025 13:57:01 -0700 Message-ID: <20250701205701.3322308-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250701205701.3322308-1-raj.khem@gmail.com> References: <20250701205701.3322308-1-raj.khem@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 01 Jul 2025 20:57:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/219723 This was used for the uninative gcc 4.8 and 4.9 incompatibility w.r.t runtime ABI, none of supported distros we use today use that old gcc Oldest we have is gcc 7.5.0 on opensuse 15.5 hosts Signed-off-by: Khem Raj --- meta/classes-global/uninative.bbclass | 2 +- meta/classes-recipe/populate_sdk_base.bbclass | 1 - meta/classes-recipe/populate_sdk_ext.bbclass | 3 +- meta/files/toolchain-shar-extract.sh | 8 - meta/lib/oe/utils.py | 147 +++++++++++------- 5 files changed, 90 insertions(+), 71 deletions(-) diff --git a/meta/classes-global/uninative.bbclass b/meta/classes-global/uninative.bbclass index 75e0c19704d..c246a1ecd6c 100644 --- a/meta/classes-global/uninative.bbclass +++ b/meta/classes-global/uninative.bbclass @@ -142,7 +142,7 @@ def enable_uninative(d): loader = d.getVar("UNINATIVE_LOADER") if os.path.exists(loader): bb.debug(2, "Enabling uninative") - d.setVar("NATIVELSBSTRING", "universal%s" % oe.utils.host_gcc_version(d)) + d.setVar("NATIVELSBSTRING", "universal") d.appendVar("SSTATEPOSTUNPACKFUNCS", " uninative_changeinterp") d.appendVarFlag("SSTATEPOSTUNPACKFUNCS", "vardepvalueexclude", "| uninative_changeinterp") d.appendVar("BUILD_LDFLAGS", " -Wl,--allow-shlib-undefined -Wl,--dynamic-linker=${UNINATIVE_LOADER} -pthread") diff --git a/meta/classes-recipe/populate_sdk_base.bbclass b/meta/classes-recipe/populate_sdk_base.bbclass index 8ef4b2be777..e6685cde97b 100644 --- a/meta/classes-recipe/populate_sdk_base.bbclass +++ b/meta/classes-recipe/populate_sdk_base.bbclass @@ -373,7 +373,6 @@ EOF -e 's#@SDK_VERSION@#${SDK_VERSION}#g' \ -e '/@SDK_PRE_INSTALL_COMMAND@/d' \ -e '/@SDK_POST_INSTALL_COMMAND@/d' \ - -e 's#@SDK_GCC_VER@#${@oe.utils.host_gcc_version(d, taskcontextonly=True)}#g' \ -e 's#@SDK_ARCHIVE_TYPE@#${SDK_ARCHIVE_TYPE}#g' \ ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.sh diff --git a/meta/classes-recipe/populate_sdk_ext.bbclass b/meta/classes-recipe/populate_sdk_ext.bbclass index 2d7d661d259..eb4e16c57cb 100644 --- a/meta/classes-recipe/populate_sdk_ext.bbclass +++ b/meta/classes-recipe/populate_sdk_ext.bbclass @@ -491,8 +491,7 @@ def prepare_locked_cache(d, baseoutpath, derivative, conf_initpath): sstate_out = baseoutpath + '/sstate-cache' bb.utils.remove(sstate_out, True) - # uninative.bbclass sets NATIVELSBSTRING to 'universal%s' % oe.utils.host_gcc_version(d) - fixedlsbstring = "universal%s" % oe.utils.host_gcc_version(d) if bb.data.inherits_class('uninative', d) else "" + fixedlsbstring = "universal" if bb.data.inherits_class('uninative', d) else "" sdk_include_toolchain = (d.getVar('SDK_INCLUDE_TOOLCHAIN') == '1') sdk_ext_type = d.getVar('SDK_EXT_TYPE') diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh index 06934e5a9ab..e2c617958a9 100644 --- a/meta/files/toolchain-shar-extract.sh +++ b/meta/files/toolchain-shar-extract.sh @@ -31,9 +31,6 @@ tweakpath /sbin INST_ARCH=$(uname -m | sed -e "s/i[3-6]86/ix86/" -e "s/x86[-_]64/x86_64/") SDK_ARCH=$(echo @SDK_ARCH@ | sed -e "s/i[3-6]86/ix86/" -e "s/x86[-_]64/x86_64/") -INST_GCC_VER=$(gcc --version 2>/dev/null | sed -ne 's/.* \([0-9]\+\.[0-9]\+\)\.[0-9]\+.*/\1/p') -SDK_GCC_VER='@SDK_GCC_VER@' - verlte () { [ "$1" = "`printf "$1\n$2" | sort -V | head -n1`" ] } @@ -145,11 +142,6 @@ fi # SDK_EXTENSIBLE is exposed from the SDK_PRE_INSTALL_COMMAND above if [ "$SDK_EXTENSIBLE" = "1" ]; then DEFAULT_INSTALL_DIR="@SDKEXTPATH@" - if [ "$INST_GCC_VER" = '4.8' -a "$SDK_GCC_VER" = '4.9' ] || [ "$INST_GCC_VER" = '4.8' -a "$SDK_GCC_VER" = '' ] || \ - [ "$INST_GCC_VER" = '4.9' -a "$SDK_GCC_VER" = '' ]; then - echo "Error: Incompatible SDK installer! Your host gcc version is $INST_GCC_VER and this SDK was built by gcc higher version." - exit 1 - fi fi if [ "$target_sdk_dir" = "" ]; then diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py index a11db5f3cd9..ac127659632 100644 --- a/meta/lib/oe/utils.py +++ b/meta/lib/oe/utils.py @@ -11,42 +11,49 @@ import errno import bb.parse + def read_file(filename): try: - f = open( filename, "r" ) + f = open(filename, "r") except IOError as reason: - return "" # WARNING: can't raise an error now because of the new RDEPENDS handling. This is a bit ugly. :M: + return "" # WARNING: can't raise an error now because of the new RDEPENDS handling. This is a bit ugly. :M: else: data = f.read().strip() f.close() return data return None -def ifelse(condition, iftrue = True, iffalse = False): + +def ifelse(condition, iftrue=True, iffalse=False): if condition: return iftrue else: return iffalse + def conditional(variable, checkvalue, truevalue, falsevalue, d): if d.getVar(variable) == checkvalue: return truevalue else: return falsevalue + def vartrue(var, iftrue, iffalse, d): import oe.types + if oe.types.boolean(d.getVar(var)): return iftrue else: return iffalse + def less_or_equal(variable, checkvalue, truevalue, falsevalue, d): if float(d.getVar(variable)) <= float(checkvalue): return truevalue else: return falsevalue + def version_less_or_equal(variable, checkvalue, truevalue, falsevalue, d): result = bb.utils.vercmp_string(d.getVar(variable), checkvalue) if result <= 0: @@ -54,6 +61,7 @@ def version_less_or_equal(variable, checkvalue, truevalue, falsevalue, d): else: return falsevalue + def both_contain(variable1, variable2, checkvalue, d): val1 = d.getVar(variable1) val2 = d.getVar(variable2) @@ -68,6 +76,7 @@ def both_contain(variable1, variable2, checkvalue, d): else: return "" + def set_intersect(variable1, variable2, d): """ Expand both variables, interpret them as lists of strings, and return the @@ -83,36 +92,44 @@ def set_intersect(variable1, variable2, d): val2 = set(d.getVar(variable2).split()) return " ".join(val1 & val2) + def prune_suffix(var, suffixes, d): # See if var ends with any of the suffixes listed and # remove it if found for suffix in suffixes: if suffix and var.endswith(suffix): - var = var[:-len(suffix)] + var = var[: -len(suffix)] prefix = d.getVar("MLPREFIX") if prefix and var.startswith(prefix): - var = var[len(prefix):] + var = var[len(prefix) :] return var + def str_filter(f, str, d): from re import match + return " ".join([x for x in str.split() if match(f, x, 0)]) + def str_filter_out(f, str, d): from re import match + return " ".join([x for x in str.split() if not match(f, x, 0)]) + def build_depends_string(depends, task): """Append a taskname to a string of dependencies as used by the [depends] flag""" return " ".join(dep + ":" + task for dep in depends.split()) + def inherits(d, *classes): """Return True if the metadata inherits any of the specified classes""" return any(bb.data.inherits_class(cls, d) for cls in classes) -def features_backfill(var,d): + +def features_backfill(var, d): # This construct allows the addition of new features to variable specified # as var # Example for var = "DISTRO_FEATURES" @@ -122,8 +139,8 @@ def features_backfill(var,d): # Distributions wanting to elide a value in DISTRO_FEATURES_BACKFILL should # add the feature to DISTRO_FEATURES_BACKFILL_CONSIDERED features = (d.getVar(var) or "").split() - backfill = (d.getVar(var+"_BACKFILL") or "").split() - considered = (d.getVar(var+"_BACKFILL_CONSIDERED") or "").split() + backfill = (d.getVar(var + "_BACKFILL") or "").split() + considered = (d.getVar(var + "_BACKFILL_CONSIDERED") or "").split() addfeatures = [] for feature in backfill: @@ -133,6 +150,7 @@ def features_backfill(var,d): if addfeatures: d.appendVar(var, " " + " ".join(addfeatures)) + def all_distro_features(d, features, truevalue="1", falsevalue=""): """ Returns truevalue if *all* given features are set in DISTRO_FEATURES, @@ -153,6 +171,7 @@ def all_distro_features(d, features, truevalue="1", falsevalue=""): """ return bb.utils.contains("DISTRO_FEATURES", features, truevalue, falsevalue, d) + def any_distro_features(d, features, truevalue="1", falsevalue=""): """ Returns truevalue if at least *one* of the given features is set in DISTRO_FEATURES, @@ -174,6 +193,7 @@ def any_distro_features(d, features, truevalue="1", falsevalue=""): """ return bb.utils.contains_any("DISTRO_FEATURES", features, truevalue, falsevalue, d) + def parallel_make(d, makeinst=False): """ Return the integer value for the number of parallel threads to use when @@ -183,22 +203,23 @@ def parallel_make(d, makeinst=False): e.g. if PARALLEL_MAKE = "-j 10", this will return 10 as an integer. """ if makeinst: - pm = (d.getVar('PARALLEL_MAKEINST') or '').split() + pm = (d.getVar("PARALLEL_MAKEINST") or "").split() else: - pm = (d.getVar('PARALLEL_MAKE') or '').split() + pm = (d.getVar("PARALLEL_MAKE") or "").split() # look for '-j' and throw other options (e.g. '-l') away while pm: opt = pm.pop(0) - if opt == '-j': + if opt == "-j": v = pm.pop(0) - elif opt.startswith('-j'): + elif opt.startswith("-j"): v = opt[2:].strip() else: continue return int(v) - return '' + return "" + def parallel_make_argument(d, fmt, limit=None, makeinst=False): """ @@ -218,23 +239,28 @@ def parallel_make_argument(d, fmt, limit=None, makeinst=False): if limit: v = min(limit, v) return fmt % v - return '' + return "" + def packages_filter_out_system(d): """ Return a list of packages from PACKAGES with the "system" packages such as PN-dbg PN-doc PN-locale-eb-gb removed. """ - pn = d.getVar('PN') - pkgfilter = [pn + suffix for suffix in ('', '-dbg', '-dev', '-doc', '-locale', '-staticdev', '-src')] + pn = d.getVar("PN") + pkgfilter = [ + pn + suffix + for suffix in ("", "-dbg", "-dev", "-doc", "-locale", "-staticdev", "-src") + ] localepkg = pn + "-locale-" pkgs = [] - for pkg in d.getVar('PACKAGES').split(): + for pkg in d.getVar("PACKAGES").split(): if pkg not in pkgfilter and localepkg not in pkg: pkgs.append(pkg) return pkgs + def getstatusoutput(cmd): return subprocess.getstatusoutput(cmd) @@ -253,10 +279,12 @@ def trim_version(version, num_parts=2): trimmed = ".".join(parts[:num_parts]) return trimmed + def cpu_count(at_least=1, at_most=64): cpus = len(os.sched_getaffinity(0)) return max(min(cpus, at_most), at_least) + def execute_pre_post_process(d, cmds): if cmds is None: return @@ -267,14 +295,17 @@ def execute_pre_post_process(d, cmds): bb.note("Executing %s ..." % cmd) bb.build.exec_func(cmd, d) + @bb.parse.vardepsexclude("BB_NUMBER_THREADS") def get_bb_number_threads(d): return int(d.getVar("BB_NUMBER_THREADS") or os.cpu_count() or 1) + def multiprocess_launch(target, items, d, extraargs=None): max_process = get_bb_number_threads(d) return multiprocess_launch_mp(target, items, max_process, extraargs) + # For each item in items, call the function 'target' with item as the first # argument, extraargs as the other arguments and handle any exceptions in the # parent thread @@ -344,7 +375,7 @@ def multiprocess_launch_mp(target, items, max_process, extraargs=None): p.join() if errors: msg = "" - for (e, tb) in errors: + for e, tb in errors: if isinstance(e, subprocess.CalledProcessError) and e.output: msg = msg + str(e) + "\n" msg = msg + "Subprocess output:" @@ -354,24 +385,27 @@ def multiprocess_launch_mp(target, items, max_process, extraargs=None): bb.fatal("Fatal errors occurred in subprocesses:\n%s" % msg) return results + def squashspaces(string): import re + return re.sub(r"\s+", " ", string).strip() + def rprovides_map(pkgdata_dir, pkg_dict): # Map file -> pkg provider rprov_map = {} for pkg in pkg_dict: - path_to_pkgfile = os.path.join(pkgdata_dir, 'runtime-reverse', pkg) + path_to_pkgfile = os.path.join(pkgdata_dir, "runtime-reverse", pkg) if not os.path.isfile(path_to_pkgfile): continue with open(path_to_pkgfile) as f: for line in f: - if line.startswith('RPROVIDES') or line.startswith('FILERPROVIDES'): + if line.startswith("RPROVIDES") or line.startswith("FILERPROVIDES"): # List all components provided by pkg. # Exclude version strings, i.e. those starting with ( - provides = [x for x in line.split()[1:] if not x.startswith('(')] + provides = [x for x in line.split()[1:] if not x.startswith("(")] for prov in provides: if prov in rprov_map: rprov_map[prov].append(pkg) @@ -380,6 +414,7 @@ def rprovides_map(pkgdata_dir, pkg_dict): return rprov_map + def format_pkg_list(pkg_dict, ret_format=None, pkgdata_dir=None): output = [] @@ -388,10 +423,14 @@ def format_pkg_list(pkg_dict, ret_format=None, pkgdata_dir=None): output.append("%s %s" % (pkg, pkg_dict[pkg]["arch"])) elif ret_format == "file": for pkg in sorted(pkg_dict): - output.append("%s %s %s" % (pkg, pkg_dict[pkg]["filename"], pkg_dict[pkg]["arch"])) + output.append( + "%s %s %s" % (pkg, pkg_dict[pkg]["filename"], pkg_dict[pkg]["arch"]) + ) elif ret_format == "ver": for pkg in sorted(pkg_dict): - output.append("%s %s %s" % (pkg, pkg_dict[pkg]["arch"], pkg_dict[pkg]["ver"])) + output.append( + "%s %s %s" % (pkg, pkg_dict[pkg]["arch"], pkg_dict[pkg]["ver"]) + ) elif ret_format == "deps": rprov_map = rprovides_map(pkgdata_dir, pkg_dict) for pkg in sorted(pkg_dict): @@ -399,18 +438,20 @@ def format_pkg_list(pkg_dict, ret_format=None, pkgdata_dir=None): if dep in rprov_map: # There could be multiple providers within the image for pkg_provider in rprov_map[dep]: - output.append("%s|%s * %s [RPROVIDES]" % (pkg, pkg_provider, dep)) + output.append( + "%s|%s * %s [RPROVIDES]" % (pkg, pkg_provider, dep) + ) else: output.append("%s|%s" % (pkg, dep)) else: for pkg in sorted(pkg_dict): output.append(pkg) - output_str = '\n'.join(output) + output_str = "\n".join(output) if output_str: # make sure last line is newline terminated - output_str += '\n' + output_str += "\n" return output_str @@ -420,24 +461,27 @@ def format_pkg_list(pkg_dict, ret_format=None, pkgdata_dir=None): def get_host_compiler_version(d, taskcontextonly=False): import re, subprocess - if taskcontextonly and d.getVar('BB_WORKERCONTEXT') != '1': + if taskcontextonly and d.getVar("BB_WORKERCONTEXT") != "1": return compiler = d.getVar("BUILD_CC") # Get rid of ccache since it is not present when parsing. - if compiler.startswith('ccache '): + if compiler.startswith("ccache "): compiler = compiler[7:] try: env = os.environ.copy() # datastore PATH does not contain session PATH as set by environment-setup-... # this breaks the install-buildtools use-case # env["PATH"] = d.getVar("PATH") - output = subprocess.check_output("%s --version" % compiler, \ - shell=True, env=env, stderr=subprocess.STDOUT).decode("utf-8") + output = subprocess.check_output( + "%s --version" % compiler, shell=True, env=env, stderr=subprocess.STDOUT + ).decode("utf-8") except subprocess.CalledProcessError as e: - bb.fatal("Error running %s --version: %s" % (compiler, e.output.decode("utf-8"))) + bb.fatal( + "Error running %s --version: %s" % (compiler, e.output.decode("utf-8")) + ) - match = re.match(r".* (\d+\.\d+)\.\d+.*", output.split('\n')[0]) + match = re.match(r".* (\d+\.\d+)\.\d+.*", output.split("\n")[0]) if not match: bb.fatal("Can't get compiler version from %s --version output" % compiler) @@ -445,36 +489,13 @@ def get_host_compiler_version(d, taskcontextonly=False): return compiler, version -def host_gcc_version(d, taskcontextonly=False): - import re, subprocess - - if taskcontextonly and d.getVar('BB_WORKERCONTEXT') != '1': - return - - compiler = d.getVar("BUILD_CC") - # Get rid of ccache since it is not present when parsing. - if compiler.startswith('ccache '): - compiler = compiler[7:] - try: - env = os.environ.copy() - env["PATH"] = d.getVar("PATH") - output = subprocess.check_output("%s --version" % compiler, \ - shell=True, env=env, stderr=subprocess.STDOUT).decode("utf-8") - except subprocess.CalledProcessError as e: - bb.fatal("Error running %s --version: %s" % (compiler, e.output.decode("utf-8"))) - - match = re.match(r".* (\d+\.\d+)\.\d+.*", output.split('\n')[0]) - if not match: - bb.fatal("Can't get compiler version from %s --version output" % compiler) - - version = match.group(1) - return "-%s" % version if version in ("4.8", "4.9") else "" - @bb.parse.vardepsexclude("DEFAULTTUNE_MULTILIB_ORIGINAL", "OVERRIDES") def get_multilib_datastore(variant, d): localdata = bb.data.createCopy(d) if variant: - overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + variant + overrides = ( + localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + variant + ) localdata.setVar("OVERRIDES", overrides) localdata.setVar("MLPREFIX", variant + "-") else: @@ -482,25 +503,32 @@ def get_multilib_datastore(variant, d): if origdefault: localdata.setVar("DEFAULTTUNE", origdefault) overrides = localdata.getVar("OVERRIDES", False).split(":") - overrides = ":".join([x for x in overrides if not x.startswith("virtclass-multilib-")]) + overrides = ":".join( + [x for x in overrides if not x.startswith("virtclass-multilib-")] + ) localdata.setVar("OVERRIDES", overrides) localdata.setVar("MLPREFIX", "") return localdata + def sh_quote(string): import shlex + return shlex.quote(string) + def directory_size(root, blocksize=4096): """ Calculate the size of the directory, taking into account hard links, rounding up every size to multiples of the blocksize. """ + def roundup(size): """ Round the size up to the nearest multiple of the block size. """ import math + return math.ceil(size / blocksize) * blocksize def getsize(filename): @@ -522,6 +550,7 @@ def directory_size(root, blocksize=4096): total += roundup(getsize(root)) return total + # Update the mtime of a file, skip if permission/read-only issues def touch(filename): try: