CVS commit: pkgsrc/lang/libunwind

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Jul 24 09:23:11 UTC 2024

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

Log Message:
libunwind: Restore yet another deleted patch.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/lang/libunwind/distinfo
cvs rdiff -u -r1.8 -r1.9 \
    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.36 pkgsrc/lang/libunwind/distinfo:1.37
--- pkgsrc/lang/libunwind/distinfo:1.36 Sat Jul  6 15:45:07 2024
+++ pkgsrc/lang/libunwind/distinfo      Wed Jul 24 09:23:11 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.36 2024/07/06 15:45:07 adam Exp $
+$NetBSD: distinfo,v 1.37 2024/07/24 09:23:11 jperkin Exp $
 
 BLAKE2s (cmake-18.1.8.src.tar.xz) = 77d99e6cf6210475bda352d49bd823ecd428ffd92c4b5bc0147583e1f2628c64
 SHA512 (cmake-18.1.8.src.tar.xz) = e02243b491f9e688db28d7b53270fcf87debf09d3c95b136a7c7b96e26890de68712c60a1e85f5a448a95ad8c81f2d8ae77047780822443bbe39f1a9e6211007
@@ -12,4 +12,4 @@ Size (libunwind-18.1.8.src.tar.xz) = 119
 BLAKE2s (runtimes-18.1.8.src.tar.xz) = f9034c238edd0e7809d4a82a0bdb643926ad23566d2447e8f4ce8ad0b068e90e
 SHA512 (runtimes-18.1.8.src.tar.xz) = 6ddf33676a1f4b69111a077e2b4bec951433f9e6d84ba2f1d578be373690e0abd8fccd1104bf34355c8fb9613c002c720b53fa536be4a923dca7e2d7abd1614c
 Size (runtimes-18.1.8.src.tar.xz) = 6788 bytes
-SHA1 (patch-src_CMakeLists.txt) = a9a226497831d5ed54e2b61956f143943d9aa3f4
+SHA1 (patch-src_CMakeLists.txt) = 23d8b2cab59d90dceb63d7d0dd9e85deeacd45aa

Index: pkgsrc/lang/libunwind/patches/patch-src_CMakeLists.txt
diff -u pkgsrc/lang/libunwind/patches/patch-src_CMakeLists.txt:1.8 pkgsrc/lang/libunwind/patches/patch-src_CMakeLists.txt:1.9
--- pkgsrc/lang/libunwind/patches/patch-src_CMakeLists.txt:1.8  Sat Jul  6 15:45:07 2024
+++ pkgsrc/lang/libunwind/patches/patch-src_CMakeLists.txt      Wed Jul 24 09:23:11 2024
@@ -1,9 +1,11 @@
-$NetBSD: patch-src_CMakeLists.txt,v 1.8 2024/07/06 15:45:07 adam Exp $
+$NetBSD: patch-src_CMakeLists.txt,v 1.9 2024/07/24 09:23:11 jperkin Exp $
 
 Fix building assembler files.
 https://github.com/llvm/llvm-project/issues/59978
 
---- src/CMakeLists.txt.orig    2023-01-12 07:12:30.000000000 +0000
+Use correct flags to link.
+
+--- src/CMakeLists.txt.orig    2024-06-15 17:21:32.000000000 +0000
 +++ src/CMakeLists.txt
 @@ -1,4 +1,5 @@
  # Get sources
@@ -11,3 +13,21 @@ 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"
+@@ -214,7 +215,7 @@ if (LIBUNWIND_ENABLE_STATIC)
+   set_target_properties(unwind_static
+     PROPERTIES
+       LINK_FLAGS "${LIBUNWIND_LINK_FLAGS}"
+-      LINKER_LANGUAGE C
++      LINKER_LANGUAGE CXX
+       OUTPUT_NAME "${LIBUNWIND_STATIC_OUTPUT_NAME}"
+   )
+