From patchwork Wed Oct 21 22:57:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 1385828 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=Z6WmxIg7; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=ORNtCQp0; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CGmCC12Bcz9sTL for ; Thu, 22 Oct 2020 09:59:18 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:MIME-Version:Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=YIFy9jeNwFsuOzN89Tak+8Avlur6a2xThcn6WAI58Lc=; b=Z6WmxIg7R6IdWLxkj3LabNAzyx QmDb5uq+VTFokgNyjAOVBxj2dzEpsO9tPolb4Bithzl+iul48ONROFlb9dPbARV9jcXdM4mx8Tbx5 b1QTLgeokiME/fSZ8Lje+62tbBiV2xdHru0PDybFgLNp4nLdU2c1koNy3tOjVqhBBIA3wpKFMQYUG O/qeuXuiGzV9UaIkkXIQkRLBFRQsSy05L+FsKOoYKbiTw22yyX3k2WL/wdJ+zOGUAISzpHmnpMZmw HYeyukjvXkslRj9oPWQfHNDGo75w0CwTYmcfRCZWq//8jsbrCtO6khWvpPyP96T+uTUQz8/V1XROC ePz5duAQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kVN2e-0007vn-He; Wed, 21 Oct 2020 22:57:12 +0000 Received: from mail-pj1-x102d.google.com ([2607:f8b0:4864:20::102d]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kVN2a-0007v4-IS for openwrt-devel@lists.openwrt.org; Wed, 21 Oct 2020 22:57:09 +0000 Received: by mail-pj1-x102d.google.com with SMTP id a17so1960559pju.1 for ; Wed, 21 Oct 2020 15:57:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=8BuULL3EqgqcrKEoeFIKCsFDz9xe/4b9D3sdvMCmAzM=; b=ORNtCQp00U6cWfx7XXVB5Ud/lJIRfdkLPH8YIbvV8Ypee1ZNL52k57KFR5rca49066 d/62F6lUm5DHh+RxReU+epEgkhqcwsRLJZG1DNqTl5tl3Z90Nj7lugRej24IyUE4Evus /2lkd1m0qUya2oZU1sX8Zliu89OdSdKiZnf4YDX1dpCI8v+lrAa1194iW2wtx1A6qq7Q e1OTD3t5jVttvfcsHXoK1L7OOdGGJBLtHFSj60GhgHB8kp2JUHhWM1/kXkXZNtysEuJ6 dn8UBYTEspbRLN8yw87mydgoxvR92cmFKA0G9Ex25XFG1tPqW4YoverwTiKX7qbnlrSz tFNg== 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:mime-version :content-transfer-encoding; bh=8BuULL3EqgqcrKEoeFIKCsFDz9xe/4b9D3sdvMCmAzM=; b=M0T8r+P/Be+C1NF7H6S0HaLqw4KD5N2dVSbyUEiN0uu6xIqjFfAbA+1ozuUZcmol7E WYv/QJJT4FSl9IbhssyGUwVk1lExEY/kwXQ89BksEPbpdIdn5FcM5N8P2w2eE+b1Rg2p 6427uX9u+Dc7THc2C0E5ml7vdkUDzE3MS06J/XacquW6/dUpNNRNpwsQDB8hfzWAxuii Jj3dYPPzMTVkpRNRtsaTaEwTgkrNWyvr5PeSDfxpWuVvMpWymaKp9M0MxufrQekQcXC5 t75Cxvb8hHaSnv4Dm2Yx8d5N28Ys5WzALdxFmXuKSLQqC5mWIxKQRFi5OsrHWO2QxsUg zFMA== X-Gm-Message-State: AOAM5315iaiGlhbNCjsfFkTfIa6ZO9MXeA7Qn0dzUmAnNqV8qEN9EDPa XZNUu3nH4J5z6TJBvfdLvzwQ3tb6/ds= X-Google-Smtp-Source: ABdhPJykH0A9XmPhHHP0pDs4XM2TafiWddXICnrcf1S70xcLdT84V/W/iKt+gOjYfK3prCrJlm5tHQ== X-Received: by 2002:a17:902:8c8b:b029:d2:42fe:370a with SMTP id t11-20020a1709028c8bb02900d242fe370amr5706514plo.83.1603321023945; Wed, 21 Oct 2020 15:57:03 -0700 (PDT) Received: from mangix-trapnet.lan ([2001:470:1f05:79e::a89]) by smtp.gmail.com with ESMTPSA id j138sm3255063pfd.19.2020.10.21.15.57.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Oct 2020 15:57:03 -0700 (PDT) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Subject: [PATCH 1/2] libcxxabi: update to 11.0.0 Date: Wed, 21 Oct 2020 15:57:00 -0700 Message-Id: <20201021225701.6775-1-rosenp@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201021_185708_711478_8FBC3D43 X-CRM114-Status: GOOD ( 16.42 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:102d listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [rosenp[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Added Fedora patch to remove the monorepo requirement. Fixed compilation under the SDK. Signed-off-by: Rosen Penev --- package/libs/libcxxabi/Makefile | 7 +++--- .../020-remove-monorepo-requirement.patch | 23 +++++++++++++++++++ 2 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 package/libs/libcxxabi/patches/020-remove-monorepo-requirement.patch diff --git a/package/libs/libcxxabi/Makefile b/package/libs/libcxxabi/Makefile index 90547561b2..f3dcbcffb9 100644 --- a/package/libs/libcxxabi/Makefile +++ b/package/libs/libcxxabi/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libcxxabi -PKG_VERSION:=10.0.0 +PKG_VERSION:=11.0.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).src.tar.xz PKG_SOURCE_URL:=https://github.com/llvm/llvm-project/releases/download/llvmorg-$(PKG_VERSION) -PKG_HASH:=e71bac75a88c9dde455ad3f2a2b449bf745eafd41d2d8432253b2964e0ca14e1 +PKG_HASH:=58697d4427b7a854ec7529337477eb4fba16407222390ad81a40d125673e4c15 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION).src PKG_MAINTAINER:=Rosen Penev @@ -51,14 +51,13 @@ CMAKE_OPTIONS += \ -DLIBCXXABI_LIBDIR_SUFFIX="" \ -DLIBCXXABI_INSTALL_LIBRARY=ON \ -DLIBCXXABI_ENABLE_SHARED=OFF \ - -DLIBCXXABI_LIBCXX_SRC_DIR=$(BUILD_DIR)/libcxx-$(PKG_VERSION).src \ -DLIBCXXABI_LIBCXX_INCLUDES=$(BUILD_DIR)/libcxx-$(PKG_VERSION).src/include TARGET_CXXFLAGS += -flto TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed define Build/Prepare - $(MAKE) -C $(TOPDIR)/package/libs/libcxx prepare + $(MAKE) -C $(TOPDIR)/$(if $(CONFIG_IN_SDK),feeds/base/)package/libs/libcxx prepare $(call Build/Prepare/Default) endef diff --git a/package/libs/libcxxabi/patches/020-remove-monorepo-requirement.patch b/package/libs/libcxxabi/patches/020-remove-monorepo-requirement.patch new file mode 100644 index 0000000000..d911dff899 --- /dev/null +++ b/package/libs/libcxxabi/patches/020-remove-monorepo-requirement.patch @@ -0,0 +1,23 @@ +From ba3084240c5dc08557734be0ed81bfa52be81bce Mon Sep 17 00:00:00 2001 +From: Tom Stellard +Date: Tue, 11 Aug 2020 08:27:41 -0700 +Subject: [PATCH] libcxxabi: Remove monorepo requirement + +--- + libcxxabi/CMakeLists.txt | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/libcxxabi/CMakeLists.txt b/libcxxabi/CMakeLists.txt +index 6cb139b311c..f124c09fcac 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,9 +1,5 @@ + # See www/CMake.html for instructions on how to build libcxxabi with CMake. + +-if (NOT IS_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/../libcxx") +- message(FATAL_ERROR "libc++abi now requires being built in a monorepo layout with libcxx available") +-endif() +- + #=============================================================================== + # Setup Project + #===============================================================================