CVS commit: pkgsrc/devel/abseil

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Wed Dec 25 20:22:48 UTC 2024

Modified Files:
        pkgsrc/devel/abseil: Makefile distinfo
Added Files:
        pkgsrc/devel/abseil/patches: patch-CMake_AbseilHelpers.cmake

Log Message:
abseil: apply upstream patch to fix mosh build. Bump PKGREVISION.

Via Paul W. Rankin in PR pkg/58900.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/devel/abseil/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/devel/abseil/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/abseil/patches/patch-CMake_AbseilHelpers.cmake

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

Modified files:

Index: pkgsrc/devel/abseil/Makefile
diff -u pkgsrc/devel/abseil/Makefile:1.27 pkgsrc/devel/abseil/Makefile:1.28
--- pkgsrc/devel/abseil/Makefile:1.27   Tue Aug  6 13:20:22 2024
+++ pkgsrc/devel/abseil/Makefile        Wed Dec 25 20:22:48 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2024/08/06 13:20:22 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2024/12/25 20:22:48 schmonz Exp $
 
 DISTNAME=      abseil-20240722.0
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=abseil/}
 GITHUB_PROJECT=        abseil-cpp

Index: pkgsrc/devel/abseil/distinfo
diff -u pkgsrc/devel/abseil/distinfo:1.26 pkgsrc/devel/abseil/distinfo:1.27
--- pkgsrc/devel/abseil/distinfo:1.26   Sun Aug 18 13:52:33 2024
+++ pkgsrc/devel/abseil/distinfo        Wed Dec 25 20:22:48 2024
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.26 2024/08/18 13:52:33 bsiegert Exp $
+$NetBSD: distinfo,v 1.27 2024/12/25 20:22:48 schmonz Exp $
 
 BLAKE2s (abseil-20240722.0-20240722.0.tar.gz) = 101081b3c74fb21327d08577b9de82353a7548cae069af0b256d10fb56edbac7
 SHA512 (abseil-20240722.0-20240722.0.tar.gz) = bd2cca8f007f2eee66f51c95a979371622b850ceb2ce3608d00ba826f7c494a1da0fba3c1427728f2c173fe50d59b701da35c2c9fdad2752a5a49746b1c8ef31
 Size (abseil-20240722.0-20240722.0.tar.gz) = 2242861 bytes
+SHA1 (patch-CMake_AbseilHelpers.cmake) = 9afcdce38e275912f63a848f5bf4dfa1a4d17c50
 SHA1 (patch-absl_base_internal_sysinfo.cc) = c96dd302dde0f6071a8353a5877a3bac37949467
 SHA1 (patch-absl_debugging_internal_elf__mem__image.cc) = 4165ab657a03194a5266815440f40cf4aa958f7b
 SHA1 (patch-absl_debugging_internal_vdso__support.cc) = 2292c5b0f2b41679039a1697508343ff5b6cc401

Added files:

Index: pkgsrc/devel/abseil/patches/patch-CMake_AbseilHelpers.cmake
diff -u /dev/null pkgsrc/devel/abseil/patches/patch-CMake_AbseilHelpers.cmake:1.1
--- /dev/null   Wed Dec 25 20:22:48 2024
+++ pkgsrc/devel/abseil/patches/patch-CMake_AbseilHelpers.cmake Wed Dec 25 20:22:48 2024
@@ -0,0 +1,30 @@
+$NetBSD: patch-CMake_AbseilHelpers.cmake,v 1.1 2024/12/25 20:22:48 schmonz Exp $
+
+Fix shell option group handling in pkgconfig files.
+From upstream commit bd0c9c5
+
+--- CMake/AbseilHelpers.cmake.orig     2024-12-25 20:10:10.414504667 +0000
++++ CMake/AbseilHelpers.cmake
+@@ -186,15 +186,15 @@ function(absl_cc_library)
+         endif()
+       endif()
+     endforeach()
+-    set(skip_next_cflag OFF)
+     foreach(cflag ${ABSL_CC_LIB_COPTS})
+-      if(skip_next_cflag)
+-        set(skip_next_cflag OFF)
+-      elseif(${cflag} MATCHES "^-Xarch_")
++      # Strip out the CMake-specific `SHELL:` prefix, which is used to construct
++      # a group of space-separated options.
++      # https://cmake.org/cmake/help/v3.30/command/target_compile_options.html#option-de-duplication
++      string(REGEX REPLACE "^SHELL:" "" cflag "${cflag}")
++      if(${cflag} MATCHES "^-Xarch_")
+         # An -Xarch_ flag implies that its successor only applies to the
+-        # specified platform. Filter both of them out before the successor
+-        # reaches the "^-m" filter.
+-        set(skip_next_cflag ON)
++        # specified platform. Such option groups are each specified in a single
++        # `SHELL:`-prefixed string in the COPTS list, which we simply ignore.
+       elseif(${cflag} MATCHES "^(-Wno|/wd)")
+         # These flags are needed to suppress warnings that might fire in our headers.
+         set(PC_CFLAGS "${PC_CFLAGS} ${cflag}")