CVS commit: pkgsrc/devel/boost-libs

["Dr. Thomas Orgis" <thor%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   thor
Date:           Fri Sep 24 18:56:17 UTC 2021

Modified Files:
        pkgsrc/devel/boost-libs: Makefile PLIST
Removed Files:
        pkgsrc/devel/boost-libs/files: test-backtrace.sh

Log Message:
devel/boost-libs: fix libbacktrace logic

This avoids calling the compiler and the barrier in the Makefile which
broke build for some folks. If libbacktrace-related files appear, they
are automatically included in PLIST. This depends on a detail of the
external toolchain (e.g. on Ubuntu) which may or may not include
libbacktrace.


To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 pkgsrc/devel/boost-libs/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/devel/boost-libs/PLIST
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/boost-libs/files/test-backtrace.sh

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.87 pkgsrc/devel/boost-libs/Makefile:1.88
--- pkgsrc/devel/boost-libs/Makefile:1.87       Sat Apr 24 14:12:17 2021
+++ pkgsrc/devel/boost-libs/Makefile    Fri Sep 24 18:56:16 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.87 2021/04/24 14:12:17 thor Exp $
+# $NetBSD: Makefile,v 1.88 2021/09/24 18:56:16 thor Exp $
 
 BOOST_PACKAGE=         libs
 BOOST_COMMENT=         (binary libraries)
@@ -47,15 +47,12 @@ PLIST.log=          yes
 PLIST.longdbl=         yes
 .endif
 
-# libboost_stacktrace_backtrace requires libbacktrace.
-# FIXME: Test on non-Linux. It should just work.
-TEST_BACKTRACE_CMD=    ${PKGSRC_SETENV} ${MAKE_ENV} ${TOOLS_PLATFORM.sh} \
-  ${FILESDIR}/test-backtrace.sh '${CXX} ${CXXFLAGS} ${CPPFLAGS}'
-.if !defined(_PKGSRC_BARRIER)
-.if ${OPSYS} == "Linux" && ${TEST_BACKTRACE_CMD:sh} == "yes"
-PLIST.backtrace=       yes
-.endif
-.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:Q}/${PREFIX:Q}; \
+  for f in lib/libboost_stacktrace_backtrace.*; do \
+   if [ -f "$$f" ]; then echo "$$f"; fi; \
+  done;
 
 UNLIMIT_RESOURCES+=    stacksize
 

Index: pkgsrc/devel/boost-libs/PLIST
diff -u pkgsrc/devel/boost-libs/PLIST:1.42 pkgsrc/devel/boost-libs/PLIST:1.43
--- pkgsrc/devel/boost-libs/PLIST:1.42  Fri Jan  1 08:19:02 2021
+++ pkgsrc/devel/boost-libs/PLIST       Fri Sep 24 18:56:16 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.42 2021/01/01 08:19:02 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.43 2021/09/24 18:56:16 thor Exp $
 lib/libboost_atomic.a
 lib/libboost_atomic.so
 lib/libboost_atomic.so.${PKGVERSION}
@@ -84,9 +84,6 @@ lib/libboost_serialization.so.${PKGVERSI
 lib/libboost_stacktrace_addr2line.a
 lib/libboost_stacktrace_addr2line.so
 lib/libboost_stacktrace_addr2line.so.${PKGVERSION}
-${PLIST.backtrace}lib/libboost_stacktrace_backtrace.a
-${PLIST.backtrace}lib/libboost_stacktrace_backtrace.so
-${PLIST.backtrace}lib/libboost_stacktrace_backtrace.so.${BOOST_VERSION}
 lib/libboost_stacktrace_basic.a
 lib/libboost_stacktrace_basic.so
 lib/libboost_stacktrace_basic.so.${PKGVERSION}