CVS commit: pkgsrc/lang/libunwind

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jan 12 22:47:25 UTC 2023

Modified Files:
        pkgsrc/lang/libunwind: distinfo
        pkgsrc/lang/libunwind/patches: patch-src_CMakeLists.txt

Log Message:
libunwind: update patch after comments from CMake developer

add new bug report URL


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/lang/libunwind/distinfo
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/lang/libunwind/patches/patch-src_CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/libunwind/distinfo
diff -u pkgsrc/lang/libunwind/distinfo:1.31 pkgsrc/lang/libunwind/distinfo:1.32
--- pkgsrc/lang/libunwind/distinfo:1.31 Thu Jan 12 19:32:54 2023
+++ pkgsrc/lang/libunwind/distinfo      Thu Jan 12 22:47:25 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2023/01/12 19:32:54 adam Exp $
+$NetBSD: distinfo,v 1.32 2023/01/12 22:47:25 wiz Exp $
 
 BLAKE2s (cmake-15.0.7.src.tar.xz) = 2c299f2c58800bcb0c5930562d24baed0e94806df8b8d5295c0866ffeaaf233f
 SHA512 (cmake-15.0.7.src.tar.xz) = 85097a6eaee0df004567905f7e5ce8ca02e3b46c6fc66fa552fe99734642e6ee61685de4e5e6e8b505963334d7b91d98ecd9c5870e6bdd3f0018ee5b963ffa96
@@ -9,4 +9,4 @@ Size (libcxx-15.0.7.src.tar.xz) = 333740
 BLAKE2s (libunwind-15.0.7.src.tar.xz) = b27b37c8706e744572afde839995cd42baf5b4d8d6e70d8003418dffdc71e731
 SHA512 (libunwind-15.0.7.src.tar.xz) = ebc73a5c68615a4462f4d05040a68a28e92b144d8c66d3fb2271cf6fff60a0adb1b913c8e520717ac2f6bd9e4b44c16d9461ef70502975975d1779e2b27a9392
 Size (libunwind-15.0.7.src.tar.xz) = 113368 bytes
-SHA1 (patch-src_CMakeLists.txt) = 32d4d89b5cd029014d163b033dde8b704009e5f1
+SHA1 (patch-src_CMakeLists.txt) = a8ac316fddf0d71c75d7f64695335a6f4842fead

Index: pkgsrc/lang/libunwind/patches/patch-src_CMakeLists.txt
diff -u pkgsrc/lang/libunwind/patches/patch-src_CMakeLists.txt:1.4 pkgsrc/lang/libunwind/patches/patch-src_CMakeLists.txt:1.5
--- pkgsrc/lang/libunwind/patches/patch-src_CMakeLists.txt:1.4  Thu Jan 12 09:01:52 2023
+++ pkgsrc/lang/libunwind/patches/patch-src_CMakeLists.txt      Thu Jan 12 22:47:25 2023
@@ -1,20 +1,29 @@
-$NetBSD: patch-src_CMakeLists.txt,v 1.4 2023/01/12 09:01:52 wiz Exp $
+$NetBSD: patch-src_CMakeLists.txt,v 1.5 2023/01/12 22:47:25 wiz Exp $
 
 Fix building assembler files.
-https://gitlab.kitware.com/cmake/cmake/-/issues/24308
+https://github.com/llvm/llvm-project/issues/59978
 
---- src/CMakeLists.txt.orig    2022-11-29 10:05:58.000000000 +0000
+--- src/CMakeLists.txt.orig    2023-01-12 07:12:30.000000000 +0000
 +++ src/CMakeLists.txt
-@@ -34,11 +34,7 @@ set(LIBUNWIND_ASM_SOURCES
- # See add_asm_sources() in compiler-rt for explanation of this workaround.
- # CMake doesn't work correctly with assembly on AIX. Workaround by compiling
- # as C files as well.
+@@ -1,4 +1,5 @@
+ # Get sources
++enable_language(ASM)
+ 
+ set(LIBUNWIND_CXX_SOURCES
+     libunwind.cpp
+@@ -31,15 +32,6 @@ set(LIBUNWIND_ASM_SOURCES
+     UnwindRegistersSave.S
+     )
+ 
+-# See add_asm_sources() in compiler-rt for explanation of this workaround.
+-# CMake doesn't work correctly with assembly on AIX. Workaround by compiling
+-# as C files as well.
 -if((APPLE AND CMAKE_VERSION VERSION_LESS 3.19) OR
 -   (MINGW AND CMAKE_VERSION VERSION_LESS 3.17) OR
 -   (${CMAKE_SYSTEM_NAME} MATCHES "AIX"))
 -  set_source_files_properties(${LIBUNWIND_ASM_SOURCES} PROPERTIES LANGUAGE C)
 -endif()
-+set_source_files_properties(${LIBUNWIND_ASM_SOURCES} PROPERTIES LANGUAGE C)
- 
+-
  set(LIBUNWIND_HEADERS
      AddressSpace.hpp
+     assembly.h