Attachment 229002 Details for Bug 259418 – devel/glog: work around clang 13 assertion

[patch] devel/glog: work around clang 13 assertion

devel__glog-fix-clang13-1.diff (text/plain), 1.22 KB, created by Dimitry Andric on 2021-10-24 19:47:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2021-10-24 19:47:21 UTC

Size: 1.22 KB

patch

obsolete

>commit 97a672c3fd69c4aa873e1514649d4df2e6e52788
>Author: Dimitry Andric <dim@FreeBSD.org>
>Date:   Sun Oct 24 21:41:16 2021 +0200
>
>    devel/glog: work around clang 13 assertion
>
>diff --git a/devel/glog/Makefile b/devel/glog/Makefile
>index de9bf320b662..3b5fcd4039a8 100644
>--- a/devel/glog/Makefile
>+++ b/devel/glog/Makefile
>@@ -27,4 +27,11 @@ USE_LDCONFIG=	yes
> GH_ACCOUNT=	google
> USE_GITHUB=	yes
> 
>+.include <bsd.port.pre.mk>
>+
>+.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 130
>+# https://bugs.llvm.org/show_bug.cgi?id=50881
>+EXTRA_PATCHES=	${FILESDIR}/extra-patch-clang13
>+.endif
>+
> .include <bsd.port.mk>
>diff --git a/devel/glog/files/extra-patch-clang13 b/devel/glog/files/extra-patch-clang13
>new file mode 100644
>index 000000000000..53f4696a6447
>--- /dev/null
>+++ b/devel/glog/files/extra-patch-clang13
>@@ -0,0 +1,10 @@
>+--- CMakeLists.txt.orig	2021-05-07 23:05:04 UTC
>++++ CMakeLists.txt
>+@@ -712,6 +705,7 @@ if (BUILD_TESTING)
>+     add_executable (stacktrace_unittest
>+       src/stacktrace_unittest.cc
>+     )
>++    set_source_files_properties ( src/stacktrace_unittest.cc PROPERTIES COMPILE_FLAGS "-flegacy-pass-manager" )
>+ 
>+     target_link_libraries (stacktrace_unittest PRIVATE ${_GLOG_TEST_LIBS})
>+   endif (HAVE_STACKTRACE)

Actions: View | Diff

Attachments on bug 259418: 229002