CVS commit: pkgsrc/lang/libunwind

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jan 12 08:52:49 UTC 2023

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

Log Message:
libunwind: fix building of assembler files

If they are not tagged as C sources, they are not built at all on NetBSD.
Extend macOS workaround for all platforms.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/lang/libunwind/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/lang/libunwind/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    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/Makefile
diff -u pkgsrc/lang/libunwind/Makefile:1.29 pkgsrc/lang/libunwind/Makefile:1.30
--- pkgsrc/lang/libunwind/Makefile:1.29 Mon Nov 14 18:44:06 2022
+++ pkgsrc/lang/libunwind/Makefile      Thu Jan 12 08:52:49 2023
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.29 2022/11/14 18:44:06 adam Exp $
+# $NetBSD: Makefile,v 1.30 2023/01/12 08:52:49 wiz Exp $
 
 .include "../../lang/llvm/version.mk"
 
 DISTNAME=      libunwind-${LLVM_VERSION}.src
 PKGNAME=       ${DISTNAME:S/.src//}
+PKGREVISION=   1
 CATEGORIES=    lang devel
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/lang/libunwind/distinfo
diff -u pkgsrc/lang/libunwind/distinfo:1.28 pkgsrc/lang/libunwind/distinfo:1.29
--- pkgsrc/lang/libunwind/distinfo:1.28 Wed Nov 30 19:55:00 2022
+++ pkgsrc/lang/libunwind/distinfo      Thu Jan 12 08:52:49 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2022/11/30 19:55:00 adam Exp $
+$NetBSD: distinfo,v 1.29 2023/01/12 08:52:49 wiz Exp $
 
 BLAKE2s (cmake-15.0.6.src.tar.xz) = 6d91c537ea78e56d2621d703d6d20d9b4f52281b80520e5003bb8ea402ad8236
 SHA512 (cmake-15.0.6.src.tar.xz) = a078b9b426515414dae41c8732d7cd955e8ddc9638b4ba9c7dd0925db68e5ea760096f08fd7e1cb9d55b6d73da75f9b4318a2fac36d7aa64f47536ac383b3edc
@@ -9,4 +9,4 @@ Size (libcxx-15.0.6.src.tar.xz) = 334347
 BLAKE2s (libunwind-15.0.6.src.tar.xz) = 9c03258bbb691d6b17a7ea0d7cd2d8516623947ccc8ae8c404e037ff8d6e1a32
 SHA512 (libunwind-15.0.6.src.tar.xz) = 9e888d66112ee2b275cad03c102a2c07ddfd01167a0c88fab17a4a190008f5c1a7a21c7e78b449f48321bc920f9fb8d64508075e4e175617c8cc0b4aeb343c3e
 Size (libunwind-15.0.6.src.tar.xz) = 113308 bytes
-SHA1 (patch-src_CMakeLists.txt) = cb7dc96b8e84caef6a71d14cc450214a05aa594b
+SHA1 (patch-src_CMakeLists.txt) = 170f52c1f9a7bb2683b7611390ca9ff2742810a8

Index: pkgsrc/lang/libunwind/patches/patch-src_CMakeLists.txt
diff -u pkgsrc/lang/libunwind/patches/patch-src_CMakeLists.txt:1.2 pkgsrc/lang/libunwind/patches/patch-src_CMakeLists.txt:1.3
--- pkgsrc/lang/libunwind/patches/patch-src_CMakeLists.txt:1.2  Wed Nov 30 19:55:00 2022
+++ pkgsrc/lang/libunwind/patches/patch-src_CMakeLists.txt      Thu Jan 12 08:52:49 2023
@@ -1,15 +1,19 @@
-$NetBSD: patch-src_CMakeLists.txt,v 1.2 2022/11/30 19:55:00 adam Exp $
+$NetBSD: patch-src_CMakeLists.txt,v 1.3 2023/01/12 08:52:49 wiz Exp $
 
-Fix build on Darwin.
+Fix building assembler files.
 
---- src/CMakeLists.txt.orig    2022-11-09 10:05:30.000000000 +0000
+--- src/CMakeLists.txt.orig    2022-11-29 10:05:58.000000000 +0000
 +++ src/CMakeLists.txt
-@@ -34,7 +34,7 @@ set(LIBUNWIND_ASM_SOURCES
+@@ -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.
 -if((APPLE AND CMAKE_VERSION VERSION_LESS 3.19) OR
-+if((APPLE AND CMAKE_VERSION VERSION_LESS 3.26) 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)
+-   (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