diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-09-16 09:32:48 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-09-16 09:32:48 +0100 |
commit | 9ee6d97c2883d42f204a533a8bc1f4562df778fb (patch) | |
tree | b690ddc0ca30f1472887edbb0b8313629bfcbbb2 /gnustep-base/libobjc2/files | |
parent | b17a3ef12038de50228bade1f05502c74e135321 (diff) |
gentoo resync : 16.09.2020
Diffstat (limited to 'gnustep-base/libobjc2/files')
3 files changed, 39 insertions, 58 deletions
diff --git a/gnustep-base/libobjc2/files/libobjc2-1.7-fix_soname.patch b/gnustep-base/libobjc2/files/libobjc2-1.7-fix_soname.patch deleted file mode 100644 index ba1aa8ecea91..000000000000 --- a/gnustep-base/libobjc2/files/libobjc2-1.7-fix_soname.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -Naur libobjc2-1.7.orig/CMakeLists.txt libobjc2-1.7/CMakeLists.txt ---- libobjc2-1.7.orig/CMakeLists.txt 2013-06-27 13:30:41.000000000 +0200 -+++ libobjc2-1.7/CMakeLists.txt 2015-05-20 13:20:55.214244088 +0200 -@@ -8,7 +8,8 @@ - set(CMAKE_C_FLAGS_RELEASE "-O3 ${CMAKE_C_FLAGS_RELEASE}") - set(CMAKE_C_FLAGS "-std=gnu99 ${CMAKE_C_FLAGS}") - --set(libobjc_VERSION 4.6) -+set(libobjc_SOVERSION 4) -+set(libobjc_VERSION 4.6.0) - - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fexceptions") - # Build configuration -@@ -204,7 +205,8 @@ - add_library(objcxx SHARED ${libobjcxx_CXX_SRCS}) - set_target_properties(objcxx PROPERTIES - LINKER_LANGUAGE C -- SOVERSION ${libobjc_VERSION} -+ SOVERSION ${libobjc_SOVERSION} -+ VERSION ${libobjc_VERSION} - ) - target_link_libraries(objcxx ${CXX_RUNTIME}) - set(CXX_RUNTIME "") -@@ -220,7 +222,8 @@ - add_library(objcxx SHARED ${libobjcxx_CXX_SRCS}) - set_target_properties(objcxx PROPERTIES - LINKER_LANGUAGE C -- SOVERSION ${libobjc_VERSION} -+ SOVERSION ${libobjc_SOVERSION} -+ VERSION ${libobjc_VERSION} - ) - set(CXX_RUNTIME "") - list(APPEND INSTALL_TARGETS objcxx) -@@ -241,7 +244,8 @@ - - set_target_properties(objc PROPERTIES - LINKER_LANGUAGE C -- SOVERSION ${libobjc_VERSION} -+ SOVERSION ${libobjc_SOVERSION} -+ VERSION ${libobjc_VERSION} - OUTPUT_NAME ${LIBOBJC_NAME} - LINK_FLAGS "${objc_LINK_FLAGS}" - ) -@@ -349,3 +353,14 @@ - add_subdirectory(Test) - endif (TESTS) - -+ -+MESSAGE(STATUS "<<< Gentoo configuration >>> -+Build type ${CMAKE_BUILD_TYPE} -+Install path ${CMAKE_INSTALL_PREFIX} -+Compiler flags: -+C ${CMAKE_C_FLAGS} -+C++ ${CMAKE_CXX_FLAGS} -+Linker flags: -+Executable ${CMAKE_EXE_LINKER_FLAGS} -+Module ${CMAKE_MODULE_LINKER_FLAGS} -+Shared ${CMAKE_SHARED_LINKER_FLAGS}\n") diff --git a/gnustep-base/libobjc2/files/libobjc2-2.1-eh_trampoline.patch b/gnustep-base/libobjc2/files/libobjc2-2.1-eh_trampoline.patch new file mode 100644 index 000000000000..c956d15fbd59 --- /dev/null +++ b/gnustep-base/libobjc2/files/libobjc2-2.1-eh_trampoline.patch @@ -0,0 +1,27 @@ +From 4e07fb8457266b76311b2bf3dc5dbe8db790c0b5 Mon Sep 17 00:00:00 2001 +From: David Chisnall <github@theravensnest.org> +Date: Wed, 26 Aug 2020 16:37:06 +0100 +Subject: [PATCH] Don't use CXXFLAGS when compiling eh_trampoline.cc + +The way that we were doing this didn't handle multiple flags and we +actually don't want the user to override these flags because that file +needs to be compiled in a very specific way. + +Fixes #177 +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e2746e9..80b7dfe 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -317,7 +317,7 @@ if (ENABLE_OBJCXX) + endif() + endif () + add_custom_command(OUTPUT eh_trampoline.s +- COMMAND ${CMAKE_CXX_COMPILER} ${CMAKE_CXX_FLAGS} -fPIC -S "${CMAKE_SOURCE_DIR}/eh_trampoline.cc" -o - -fexceptions -fno-inline | sed "s/__gxx_personality_v0/test_eh_personality/g" > "${CMAKE_BINARY_DIR}/eh_trampoline.s" ++ COMMAND ${CMAKE_CXX_COMPILER} -fPIC -S "${CMAKE_SOURCE_DIR}/eh_trampoline.cc" -o - -fexceptions -fno-inline | sed "s/__gxx_personality_v0/test_eh_personality/g" > "${CMAKE_BINARY_DIR}/eh_trampoline.s" + MAIN_DEPENDENCY eh_trampoline.cc) + list(APPEND libobjc_ASM_SRCS eh_trampoline.s) + list(APPEND libobjc_CXX_SRCS objcxx_eh.cc) diff --git a/gnustep-base/libobjc2/files/libobjc2-2.1-pthread_link.patch b/gnustep-base/libobjc2/files/libobjc2-2.1-pthread_link.patch new file mode 100644 index 000000000000..4d6f1d517db1 --- /dev/null +++ b/gnustep-base/libobjc2/files/libobjc2-2.1-pthread_link.patch @@ -0,0 +1,12 @@ +diff -Naur libobjc2-2.1.orig/CMakeLists.txt libobjc2-2.1/CMakeLists.txt +--- libobjc2-2.1.orig/CMakeLists.txt 2020-08-23 17:10:20.000000000 +0200 ++++ libobjc2-2.1/CMakeLists.txt 2020-09-03 10:51:38.716078009 +0200 +@@ -344,7 +344,7 @@ + # threading implementation (we do for everything except thread-local storage) + set(CMAKE_THREAD_PREFER_PTHREAD) + include(FindThreads) +-set(objc_LINK_FLAGS "${objc_LINK_FLAGS} ${CMAKE_THREAD_LIBS_INIT}") ++target_link_libraries(objc Threads::Threads) + + + |