CVS commit: pkgsrc/lang/libunwind

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat May 10 17:37:07 UTC 2025

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

Log Message:
libunwind: fix update fallout observed on SmartOS and Linux


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/lang/libunwind/distinfo
cvs rdiff -u -r1.10 -r1.11 \
    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.38 pkgsrc/lang/libunwind/distinfo:1.39
--- pkgsrc/lang/libunwind/distinfo:1.38 Fri May  9 05:51:25 2025
+++ pkgsrc/lang/libunwind/distinfo      Sat May 10 17:37:07 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.38 2025/05/09 05:51:25 adam Exp $
+$NetBSD: distinfo,v 1.39 2025/05/10 17:37:07 tnn Exp $
 
 BLAKE2s (cmake-19.1.7.src.tar.xz) = 420fe22b00305abc7924fd6cb58bc1ba1c17c6e79a6b51ffb406163db7f1805c
 SHA512 (cmake-19.1.7.src.tar.xz) = 3ff56e1a61dbace35d8c168ad5c94c5a09d92eb683494bfe1deabcb3640cf79b7422d44903d049d2298d54c2874f9a60c4f13f6795a3949e7eaefd5d42e62621
@@ -12,4 +12,4 @@ Size (libunwind-19.1.7.src.tar.xz) = 120
 BLAKE2s (runtimes-19.1.7.src.tar.xz) = 196d02c1a9acc62eb19e300df6e2213312b3522a518322dd7eab47559e0884e0
 SHA512 (runtimes-19.1.7.src.tar.xz) = 6b87dafe809b49560c72b9872f4e2795de70c66000af2272ad46fc044e5c88a3415aaa444f80d37946da14127cd4645b2a7420e3e184641215f415b709d801d8
 Size (runtimes-19.1.7.src.tar.xz) = 7224 bytes
-SHA1 (patch-src_CMakeLists.txt) = a9a226497831d5ed54e2b61956f143943d9aa3f4
+SHA1 (patch-src_CMakeLists.txt) = 77f3a681ee57897532754bcd8dc617d431a6121a

Index: pkgsrc/lang/libunwind/patches/patch-src_CMakeLists.txt
diff -u pkgsrc/lang/libunwind/patches/patch-src_CMakeLists.txt:1.10 pkgsrc/lang/libunwind/patches/patch-src_CMakeLists.txt:1.11
--- pkgsrc/lang/libunwind/patches/patch-src_CMakeLists.txt:1.10 Fri May  9 05:51:25 2025
+++ pkgsrc/lang/libunwind/patches/patch-src_CMakeLists.txt      Sat May 10 17:37:07 2025
@@ -1,9 +1,14 @@
-$NetBSD: patch-src_CMakeLists.txt,v 1.10 2025/05/09 05:51:25 adam Exp $
+$NetBSD: patch-src_CMakeLists.txt,v 1.11 2025/05/10 17:37:07 tnn Exp $
 
-Fix building assembler files.
-https://github.com/llvm/llvm-project/issues/59978
+- Fix building assembler files.
+  https://github.com/llvm/llvm-project/issues/59978
 
---- src/CMakeLists.txt.orig    2023-01-12 07:12:30.000000000 +0000
+- It checks for -nostdlib++ on the C++ compiler (g++) but then tries to
+  pass it to the C compiler (gcc). This does not work:
+  gcc: error: unrecognized command-line option '-nostdlib++'
+  So use the C++ compiler for linking.
+
+--- src/CMakeLists.txt.orig    2025-01-14 09:41:02.000000000 +0000
 +++ src/CMakeLists.txt
 @@ -1,4 +1,5 @@
  # Get sources
@@ -11,3 +16,12 @@ https://github.com/llvm/llvm-project/iss
  
  set(LIBUNWIND_CXX_SOURCES
      libunwind.cpp
+@@ -168,7 +169,7 @@ if (LIBUNWIND_ENABLE_SHARED)
+   set_target_properties(unwind_shared
+     PROPERTIES
+       LINK_FLAGS "${LIBUNWIND_LINK_FLAGS}"
+-      LINKER_LANGUAGE C
++      LINKER_LANGUAGE CXX
+       OUTPUT_NAME "${LIBUNWIND_SHARED_OUTPUT_NAME}"
+       VERSION "1.0"
+       SOVERSION "1"