Re: CVS commit: pkgsrc/meta-pkgs/boost

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

What about:

in boost-libs/buildlink3.mk, add

BUILDLINK_FILES.boost-libs+= cmake/*.cmake
BUILDLINK_FILES.boost-libs+= cmake/whatever/*.cmake

instead?
 Thomas

On Thu, Dec 26, 2024 at 09:52:31PM +0000, Frédéric Fauberteau wrote:
> Module Name:	pkgsrc
> Committed By:	triaxx
> Date:		Thu Dec 26 21:52:31 UTC 2024
> 
> Modified Files:
> 	pkgsrc/meta-pkgs/boost: Makefile.common
> Added Files:
> 	pkgsrc/meta-pkgs/boost: cmake-dirs.mk
> 
> Log Message:
> boost: Add target for CMake files
> 
> pkgsrc changes:
> ---------------
>   * The FindBoost module of CMake is removed since version 3.30
>     (https://cmake.org/cmake/help/v3.30/policy/CMP0167.html). Upstream
>     Boost provides CMake files as replacement since version 1.70. Add a
>     target to install these files in ${DESTDIR}.
>   * This target uses an extra file cmake-dirs.mk to list the subdirectories
>     in lib/cmake/. But a more automatic method should be considered...
> 
> 
> To generate a diff of this commit:
> cvs rdiff -u -r1.102 -r1.103 pkgsrc/meta-pkgs/boost/Makefile.common
> cvs rdiff -u -r0 -r1.1 pkgsrc/meta-pkgs/boost/cmake-dirs.mk
> 
> Please note that diffs are not public domain; they are subject to the
> copyright notices on the relevant files.
> 

> Modified files:
> 
> Index: pkgsrc/meta-pkgs/boost/Makefile.common
> diff -u pkgsrc/meta-pkgs/boost/Makefile.common:1.102 pkgsrc/meta-pkgs/boost/Makefile.common:1.103
> --- pkgsrc/meta-pkgs/boost/Makefile.common:1.102	Thu Oct 10 14:44:17 2024
> +++ pkgsrc/meta-pkgs/boost/Makefile.common	Thu Dec 26 21:52:31 2024
> @@ -1,4 +1,4 @@
> -# $NetBSD: Makefile.common,v 1.102 2024/10/10 14:44:17 jperkin Exp $
> +# $NetBSD: Makefile.common,v 1.103 2024/12/26 21:52:31 triaxx Exp $
>  #
>  # used by devel/boost-build/Makefile
>  # used by devel/boost-docs/Makefile
> @@ -96,4 +96,12 @@ boost-install-libs:
>  	${INSTALL_LIB_DIR} ${DESTDIR}${PREFIX}/lib
>  	cd ${WRKSRC}/stage/lib && pax -rw -p p libboost* ${DESTDIR}${PREFIX}/lib
>  
> +.include "cmake-dirs.mk"
> +
> +boost-install-cmake:
> +.  for dir in ${BOOST_CMAKE_DIRS}
> +	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/${dir}
> +	cd ${WRKSRC}/stage/lib/${dir} && ${FIND} . -type f -name "*.cmake" -exec ${INSTALL_DATA} '{}' ${DESTDIR}${PREFIX}/lib/${dir}/'{}' \;
> +.  endfor
> +
>  .endif # ${BOOST_PACKAGE} == "meta-pkg"
> 
> Added files:
> 
> Index: pkgsrc/meta-pkgs/boost/cmake-dirs.mk
> diff -u /dev/null pkgsrc/meta-pkgs/boost/cmake-dirs.mk:1.1
> --- /dev/null	Thu Dec 26 21:52:31 2024
> +++ pkgsrc/meta-pkgs/boost/cmake-dirs.mk	Thu Dec 26 21:52:31 2024
> @@ -0,0 +1,57 @@
> +# $NetBSD: cmake-dirs.mk,v 1.1 2024/12/26 21:52:31 triaxx Exp $
> +#
> +# BOOST_CMAKE_DIRS is the list of directories from ${WRKSRC}/stage/lib that
> +#	contains CMake files.
> +#
> +# This file can be generated after 'make build' by running:
> +#     cd ${WRKSRC}/stage/lib && find cmake -type d
> +#
> +# TODO: implement a target to automatically generate this file
> +
> +BOOST_CMAKE_DIRS+=	cmake
> +BOOST_CMAKE_DIRS+=	cmake/boost_date_time-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_exception-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_fiber-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_filesystem-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_graph-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_graph_parallel-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_iostreams-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_json-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_locale-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_thread-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_log-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_log_setup-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_math_c99-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_math_c99f-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_math_c99l-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_mpi-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_math_tr1-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_math_tr1f-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_math_tr1l-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_nowide-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_process-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_program_options-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_random-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_regex-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_serialization-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_wserialization-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_stacktrace_noop-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_stacktrace_basic-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_stacktrace_addr2line-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_system-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_timer-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_prg_exec_monitor-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_test_exec_monitor-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_unit_test_framework-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_type_erasure-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_wave-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_atomic-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_url-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/Boost-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_headers-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_charconv-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_chrono-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_container-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_context-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_contract-${BOOST_VERSION}
> +BOOST_CMAKE_DIRS+=	cmake/boost_coroutine-${BOOST_VERSION}
>