CVS commit: pkgsrc/devel/protobuf

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed May 20 09:31:35 UTC 2026

Modified Files:
        pkgsrc/devel/protobuf: Makefile

Log Message:
protobuf: Add BIND_NOW workaround to avoid illumos deadlocks.


To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 pkgsrc/devel/protobuf/Makefile

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

Modified files:

Index: pkgsrc/devel/protobuf/Makefile
diff -u pkgsrc/devel/protobuf/Makefile:1.104 pkgsrc/devel/protobuf/Makefile:1.105
--- pkgsrc/devel/protobuf/Makefile:1.104        Thu Apr 16 09:56:13 2026
+++ pkgsrc/devel/protobuf/Makefile      Wed May 20 09:31:34 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.104 2026/04/16 09:56:13 adam Exp $
+# $NetBSD: Makefile,v 1.105 2026/05/20 09:31:34 jperkin Exp $
 #
 # When updating this, please also update devel/py-protobuf.
 #
@@ -32,6 +32,11 @@ CMAKE_CONFIGURE_ARGS+=       -Dprotobuf_BUILD_
 # requires googletest to be checked out in third_party/googletest
 CMAKE_CONFIGURE_ARGS+= -Dprotobuf_BUILD_TESTS=OFF
 
+# illumos ld.so lazy PLT binding can invoke .init_array mid-init, re-entering
+# a __cxa_guard-protected singleton and deadlocking.  protobuf generates these
+# in .pb.cc files, so force BIND_NOW to resolve all PLT entries before init.
+LDFLAGS.SunOS+=                -Wl,-z,now
+
 # the [[ command will skip a test that would otherwise run
 CHECK_PORTABILITY_SKIP+=       src/google/protobuf/compiler/zip_output_unittest.sh