diff mbox series

[1/2] libcxxabi: update to 11.0.0

Message ID 20201021225701.6775-1-rosenp@gmail.com
State New
Headers show
Series [1/2] libcxxabi: update to 11.0.0 | expand

Commit Message

Rosen Penev Oct. 21, 2020, 10:57 p.m. UTC
Added Fedora patch to remove the monorepo requirement.

Fixed compilation under the SDK.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 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 mbox series

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 <rosenp@gmail.com>
@@ -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 <tstellar@redhat.com>
+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
+ #===============================================================================