CVS commit: pkgsrc/lang/libunwind

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Dec  1 18:27:23 UTC 2023

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

Log Message:
libunwind: Use correct flags to link.

The configure script only tests if CXX supports various flags, but then uses
CC to compile and link various objects.  While compiling only issues warnings
about incorrect flags, attempting to link with the wrong front end causes
fatal errors.

Specifically fixes trying to link with gcc using "-nostdlib++".


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/lang/libunwind/distinfo
cvs rdiff -u -r1.5 -r1.6 \
    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.33 pkgsrc/lang/libunwind/distinfo:1.34
--- pkgsrc/lang/libunwind/distinfo:1.33 Fri Oct  6 19:15:21 2023
+++ pkgsrc/lang/libunwind/distinfo      Fri Dec  1 18:27:22 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.33 2023/10/06 19:15:21 adam Exp $
+$NetBSD: distinfo,v 1.34 2023/12/01 18:27:22 jperkin Exp $
 
 BLAKE2s (cmake-16.0.6.src.tar.xz) = a967225f31bcd98484d632a2d530c498131b0035f18b15e27915663b915dc6ba
 SHA512 (cmake-16.0.6.src.tar.xz) = 52ecd941d2d85a5b668caa5d0d40480cb6a97b3bf1174e634c2a93e9ef6d03670ca7e96abb0a60cb33ba537b93d5788754dab1f2f45c1f623f788162717d088b
@@ -9,4 +9,4 @@ Size (libcxx-16.0.6.src.tar.xz) = 365552
 BLAKE2s (libunwind-16.0.6.src.tar.xz) = a34c9ff82a3d889c4b9278bca3a96429f285dd38961d49309570bc60600e5fb6
 SHA512 (libunwind-16.0.6.src.tar.xz) = abc1463bbebd771832c5da34aeb1dfe4c168b90c8257abfcfda573f495359b5968a2169f528dbf8276ed0b9bc1c42f27f4b4383d335d6e6416b6a536074b3f3f
 Size (libunwind-16.0.6.src.tar.xz) = 115032 bytes
-SHA1 (patch-src_CMakeLists.txt) = a8ac316fddf0d71c75d7f64695335a6f4842fead
+SHA1 (patch-src_CMakeLists.txt) = 84e31c445264c70b281374c43f46c5e9f1802bfa

Index: pkgsrc/lang/libunwind/patches/patch-src_CMakeLists.txt
diff -u pkgsrc/lang/libunwind/patches/patch-src_CMakeLists.txt:1.5 pkgsrc/lang/libunwind/patches/patch-src_CMakeLists.txt:1.6
--- pkgsrc/lang/libunwind/patches/patch-src_CMakeLists.txt:1.5  Thu Jan 12 22:47:25 2023
+++ pkgsrc/lang/libunwind/patches/patch-src_CMakeLists.txt      Fri Dec  1 18:27:22 2023
@@ -1,9 +1,11 @@
-$NetBSD: patch-src_CMakeLists.txt,v 1.5 2023/01/12 22:47:25 wiz Exp $
+$NetBSD: patch-src_CMakeLists.txt,v 1.6 2023/12/01 18:27:22 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    2023-06-10 22:58:16.000000000 +0000
 +++ src/CMakeLists.txt
 @@ -1,4 +1,5 @@
  # Get sources
@@ -27,3 +29,21 @@ https://github.com/llvm/llvm-project/iss
  set(LIBUNWIND_HEADERS
      AddressSpace.hpp
      assembly.h
+@@ -160,7 +152,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"
+@@ -200,7 +192,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}"
+   )
+