diff mbox series

[2/2] libcxx: update to 11.0.0

Message ID 20201021225701.6775-2-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 monorepo requirement.

Refreshed other patch.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 package/libs/libcxx/Makefile                  |  4 +--
 package/libs/libcxx/patches/010-ssp.patch     |  2 +-
 .../020-remove-monorepo-requirement.patch     | 33 +++++++++++++++++++
 3 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 package/libs/libcxx/patches/020-remove-monorepo-requirement.patch
diff mbox series

Patch

diff --git a/package/libs/libcxx/Makefile b/package/libs/libcxx/Makefile
index 3809bea651..e00bb9eefb 100644
--- a/package/libs/libcxx/Makefile
+++ b/package/libs/libcxx/Makefile
@@ -7,12 +7,12 @@ 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libcxx
-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:=270f8a3f176f1981b0f6ab8aa556720988872ec2b48ed3b605d0ced8d09156c7
+PKG_HASH:=6c1ee6690122f2711a77bc19241834a9219dda5036e1597bfa397f341a9b8b7a
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION).src
 
 PKG_MAINTAINER:=Rosen Penev <rosenp@gmail.com>
diff --git a/package/libs/libcxx/patches/010-ssp.patch b/package/libs/libcxx/patches/010-ssp.patch
index f83c7b9b56..891d4a889b 100644
--- a/package/libs/libcxx/patches/010-ssp.patch
+++ b/package/libs/libcxx/patches/010-ssp.patch
@@ -1,6 +1,6 @@ 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -760,6 +760,10 @@ function(cxx_link_system_libraries targe
+@@ -769,6 +769,10 @@ function(cxx_link_system_libraries targe
      target_link_libraries(${target} PRIVATE atomic)
    endif()
  
diff --git a/package/libs/libcxx/patches/020-remove-monorepo-requirement.patch b/package/libs/libcxx/patches/020-remove-monorepo-requirement.patch
new file mode 100644
index 0000000000..bfc619ac23
--- /dev/null
+++ b/package/libs/libcxx/patches/020-remove-monorepo-requirement.patch
@@ -0,0 +1,33 @@ 
+From 796bd4b1417f8799418f0109f9fec5a9755a5681 Mon Sep 17 00:00:00 2001
+From: Tom Stellard <tstellar@redhat.com>
+Date: Tue, 11 Aug 2020 07:55:18 -0700
+Subject: [PATCH] libcxx: Remove monorepo requirement
+
+---
+ libcxx/CMakeLists.txt | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt
+index f37d729a8a1..a6ea8e09d8c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,10 +1,3 @@
+-# See https://libcxx.llvm.org/docs/BuildingLibcxx.html for instructions on how
+-# to build libcxx with CMake.
+-
+-if (NOT IS_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/../libcxxabi")
+-  message(FATAL_ERROR "libc++ now requires being built in a monorepo layout with libcxxabi available")
+-endif()
+-
+ #===============================================================================
+ # Setup Project
+ #===============================================================================
+@@ -36,8 +29,6 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBCXX_STANDALONE_BUIL
+   set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
+   set(PACKAGE_BUGREPORT "llvm-bugs@lists.llvm.org")
+ 
+-  # Find the LLVM sources and simulate LLVM CMake options.
+-  include(HandleOutOfTreeLLVM)
+ endif()
+ 
+ if (LIBCXX_STANDALONE_BUILD)