CVS commit: pkgsrc/devel/boost-libs

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Wed Feb  5 22:14:11 UTC 2025

Modified Files:
        pkgsrc/devel/boost-libs: Makefile PLIST

Log Message:
devel/boost-libs: Handle stacktrace.addr2line in cross-builds.

This is a stop-gap measure because I don't know how to spell, e.g.,

CONFIGURE_ARGS+=        ac_cv_addr2line_path=/usr/bin/addr2line

in boost-jamlish.

No change to native builds, and cross builds were broken without this
change, so no revbump.


To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.114 pkgsrc/devel/boost-libs/Makefile
cvs rdiff -u -r1.48 -r1.49 pkgsrc/devel/boost-libs/PLIST

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

Modified files:

Index: pkgsrc/devel/boost-libs/Makefile
diff -u pkgsrc/devel/boost-libs/Makefile:1.113 pkgsrc/devel/boost-libs/Makefile:1.114
--- pkgsrc/devel/boost-libs/Makefile:1.113      Wed Jan  8 15:23:21 2025
+++ pkgsrc/devel/boost-libs/Makefile    Wed Feb  5 22:14:11 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.113 2025/01/08 15:23:21 wiz Exp $
+# $NetBSD: Makefile,v 1.114 2025/02/05 22:14:11 riastradh Exp $
 
 BOOST_PACKAGE=         libs
 BOOST_COMMENT=         (binary libraries)
@@ -49,6 +49,16 @@ PLIST.log=           yes
 PLIST.longdbl=         yes
 .endif
 
+PLIST_VARS+=           stacktrace_addr2line
+
+# XXX In principle addr2line should work just as well in a cross-built
+# system as in a natively-built system, but it is detected by a
+# run-test and I don't know the boost-jam incantation to override that
+# test.  So for now, we'll just omit it.
+.if ${USE_CROSS_COMPILE:tl} == "no"
+PLIST.stacktrace_addr2line=    yes
+.endif
+
 # Add backtrace libs when they got built because of libbacktrace
 # being available in the toolchain (not easy to detect beforehand).
 GENERATE_PLIST+=       cd ${DESTDIR}/${PREFIX}; \

Index: pkgsrc/devel/boost-libs/PLIST
diff -u pkgsrc/devel/boost-libs/PLIST:1.48 pkgsrc/devel/boost-libs/PLIST:1.49
--- pkgsrc/devel/boost-libs/PLIST:1.48  Wed Jan  8 15:23:21 2025
+++ pkgsrc/devel/boost-libs/PLIST       Wed Feb  5 22:14:11 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.48 2025/01/08 15:23:21 wiz Exp $
+@comment $NetBSD: PLIST,v 1.49 2025/02/05 22:14:11 riastradh Exp $
 lib/cmake/Boost-${PKGVERSION}/BoostConfig.cmake
 lib/cmake/Boost-${PKGVERSION}/BoostConfigVersion.cmake
 lib/cmake/BoostDetectToolset-${PKGVERSION}.cmake
@@ -130,10 +130,10 @@ lib/cmake/boost_serialization-${PKGVERSI
 lib/cmake/boost_serialization-${PKGVERSION}/boost_serialization-config.cmake
 lib/cmake/boost_serialization-${PKGVERSION}/libboost_serialization-variant-shared.cmake
 lib/cmake/boost_serialization-${PKGVERSION}/libboost_serialization-variant-static.cmake
-lib/cmake/boost_stacktrace_addr2line-${PKGVERSION}/boost_stacktrace_addr2line-config-version.cmake
-lib/cmake/boost_stacktrace_addr2line-${PKGVERSION}/boost_stacktrace_addr2line-config.cmake
-lib/cmake/boost_stacktrace_addr2line-${PKGVERSION}/libboost_stacktrace_addr2line-variant-shared.cmake
-lib/cmake/boost_stacktrace_addr2line-${PKGVERSION}/libboost_stacktrace_addr2line-variant-static.cmake
+${PLIST.stacktrace_addr2line}lib/cmake/boost_stacktrace_addr2line-${PKGVERSION}/boost_stacktrace_addr2line-config-version.cmake
+${PLIST.stacktrace_addr2line}lib/cmake/boost_stacktrace_addr2line-${PKGVERSION}/boost_stacktrace_addr2line-config.cmake
+${PLIST.stacktrace_addr2line}lib/cmake/boost_stacktrace_addr2line-${PKGVERSION}/libboost_stacktrace_addr2line-variant-shared.cmake
+${PLIST.stacktrace_addr2line}lib/cmake/boost_stacktrace_addr2line-${PKGVERSION}/libboost_stacktrace_addr2line-variant-static.cmake
 lib/cmake/boost_stacktrace_basic-${PKGVERSION}/boost_stacktrace_basic-config-version.cmake
 lib/cmake/boost_stacktrace_basic-${PKGVERSION}/boost_stacktrace_basic-config.cmake
 lib/cmake/boost_stacktrace_basic-${PKGVERSION}/libboost_stacktrace_basic-variant-shared.cmake
@@ -270,9 +270,9 @@ lib/libboost_regex.so.${PKGVERSION}
 lib/libboost_serialization.a
 lib/libboost_serialization.so
 lib/libboost_serialization.so.${PKGVERSION}
-lib/libboost_stacktrace_addr2line.a
-lib/libboost_stacktrace_addr2line.so
-lib/libboost_stacktrace_addr2line.so.${PKGVERSION}
+${PLIST.stacktrace_addr2line}lib/libboost_stacktrace_addr2line.a
+${PLIST.stacktrace_addr2line}lib/libboost_stacktrace_addr2line.so
+${PLIST.stacktrace_addr2line}lib/libboost_stacktrace_addr2line.so.${PKGVERSION}
 lib/libboost_stacktrace_basic.a
 lib/libboost_stacktrace_basic.so
 lib/libboost_stacktrace_basic.so.${PKGVERSION}