commit: ebc65b360483b27111d2f727bb4aea66aa778eba Author: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org> AuthorDate: Sun Mar 14 15:33:33 2021 +0000 Commit: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org> CommitDate: Sun Mar 14 15:35:14 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebc65b36
dev-libs/libdispatch: 5.3.3: Drop -Werror; block on libobjc2. Closes: https://bugs.gentoo.org/show_bug.cgi?id=775692 Closes: https://bugs.gentoo.org/show_bug.cgi?id=775623 Signed-off-by: Piotr Karbowski <slashbeast <AT> gentoo.org> dev-libs/libdispatch/files/remove-Werror.patch | 25 ++++++++++++++++++++++ ...ch-5.3.3.ebuild => libdispatch-5.3.3-r1.ebuild} | 5 +++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dev-libs/libdispatch/files/remove-Werror.patch b/dev-libs/libdispatch/files/remove-Werror.patch new file mode 100644 index 00000000000..bdc3edf2d48 --- /dev/null +++ b/dev-libs/libdispatch/files/remove-Werror.patch @@ -0,0 +1,25 @@ +diff --git a/cmake/modules/DispatchCompilerWarnings.cmake b/cmake/modules/DispatchCompilerWarnings.cmake +index 35b80f3..cc554ed 100644 +--- a/cmake/modules/DispatchCompilerWarnings.cmake ++++ b/cmake/modules/DispatchCompilerWarnings.cmake +@@ -2,7 +2,6 @@ + if("${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC") + # TODO: someone needs to provide the msvc equivalent warning flags + else() +- add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-Werror>) + add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-Wall>) + add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-Wextra>) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index adc989d..2841aa2 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -127,7 +127,7 @@ endif() + # FIXME(compnerd) add check for -fblocks? + target_compile_options(dispatch PRIVATE -fblocks) + +-check_c_compiler_flag("-momit-leaf-frame-pointer -Werror -Wall -O3" C_SUPPORTS_OMIT_LEAF_FRAME_POINTER) ++check_c_compiler_flag("-momit-leaf-frame-pointer -Wall -O3" C_SUPPORTS_OMIT_LEAF_FRAME_POINTER) + if (C_SUPPORTS_OMIT_LEAF_FRAME_POINTER) + target_compile_options(dispatch PRIVATE -momit-leaf-frame-pointer) + endif() diff --git a/dev-libs/libdispatch/libdispatch-5.3.3.ebuild b/dev-libs/libdispatch/libdispatch-5.3.3-r1.ebuild similarity index 91% rename from dev-libs/libdispatch/libdispatch-5.3.3.ebuild rename to dev-libs/libdispatch/libdispatch-5.3.3-r1.ebuild index d469c43530f..d02b56e15ca 100644 --- a/dev-libs/libdispatch/libdispatch-5.3.3.ebuild +++ b/dev-libs/libdispatch/libdispatch-5.3.3-r1.ebuild @@ -16,7 +16,7 @@ LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~x86" -DEPEND="" +DEPEND="!gnustep-base/libobjc2" RDEPEND="${DEPEND}" BDEPEND=" sys-devel/clang @@ -25,9 +25,10 @@ BDEPEND=" S="${WORKDIR}/${MY_PN}-${MY_PV}" +PATCHES=( "${FILESDIR}/remove-Werror.patch" ) + src_configure () { if ! tc-is-clang ; then - have_switched_compiler=yes AR=llvm-ar CC=${CHOST}-clang CXX=${CHOST}-clang++
