On Thu, Sep 14, 2023 at 03:09:00PM +0200, Omar Polo wrote:
> friendly ping, reattaching the two patches.
> 

> Index: infrastructure/mk/bsd.port.mk
> ===================================================================
> RCS file: /home/cvs/ports/infrastructure/mk/bsd.port.mk,v
> retrieving revision 1.1621
> diff -u -p -r1.1621 bsd.port.mk
> --- infrastructure/mk/bsd.port.mk     13 Sep 2023 07:47:11 -0000      1.1621
> +++ infrastructure/mk/bsd.port.mk     14 Sep 2023 13:05:28 -0000
> @@ -280,6 +280,8 @@ NO_TEST ?= No
>  INSTALL_TARGET ?= install
>  USE_GROFF ?= No
>  
> +CHECK_LIB_DEPENDS_ARGS =
> +
>  .if !defined(_ARCH_DEFINES_INCLUDED)
>  _ARCH_DEFINES_INCLUDED = Done
>  .  include "${PORTSDIR}/infrastructure/mk/arch-defines.mk"
> @@ -1981,12 +1983,13 @@ _check_lib_depends = ${_CHECK_LIB_DEPEND
>  _check_lib_depends =:
>  .endif
>  
> +CHECK_LIB_DEPENDS_ARGS += -S COMPILER_LIBCXX="${COMPILER_LIBCXX}"
> +CHECK_LIB_DEPENDS_ARGS += -S LIBECXX="${LIBECXX}"
> +CHECK_LIB_DEPENDS_ARGS += -S LIBCXX="${LIBCXX}"
> +CHECK_LIB_DEPENDS_ARGS += -F pthread
> +
>  _CHECK_LIB_DEPENDS = PORTSDIR=${PORTSDIR} ${_PERLSCRIPT}/check-lib-depends
> -_CHECK_LIB_DEPENDS += -d ${_PKG_REPO} -B ${WRKINST}
> -_CHECK_LIB_DEPENDS += -S COMPILER_LIBCXX="${COMPILER_LIBCXX}"
> -_CHECK_LIB_DEPENDS += -S LIBECXX="${LIBECXX}"
> -_CHECK_LIB_DEPENDS += -S LIBCXX="${LIBCXX}"
> -_CHECK_LIB_DEPENDS += -F pthread
> +_CHECK_LIB_DEPENDS += -d ${_PKG_REPO} -B ${WRKINST} ${CHECK_LIB_DEPENDS_ARGS}
>  
>  .for _s in ${MULTI_PACKAGES}
>  .  if ${STATIC_PLIST${_s}:L} == "no"
> Index: devel/cargo/cargo.port.mk
> ===================================================================
> RCS file: /home/cvs/ports/devel/cargo/cargo.port.mk,v
> retrieving revision 1.38
> diff -u -p -r1.38 cargo.port.mk
> --- devel/cargo/cargo.port.mk 2 Sep 2023 17:26:36 -0000       1.38
> +++ devel/cargo/cargo.port.mk 14 Sep 2023 13:06:02 -0000
> @@ -36,6 +36,9 @@ MODCARGO_WANTLIB += c++abi
>  MODCARGO_WANTLIB +=
>  .endif
>  
> +CHECK_LIB_DEPENDS_ARGS += -S MODCARGO_WANTLIB="${MODCARGO_WANTLIB}"
> +CHECK_LIB_DEPENDS_ARGS += -F c++abi
> +
>  # Define MASTER_SITES_CRATESIO for crates.io
>  MASTER_SITES.cargo = https://crates.io/api/v1/crates/
>  
> Index: lang/lua/lua.port.mk
> ===================================================================
> RCS file: /home/cvs/ports/lang/lua/lua.port.mk,v
> retrieving revision 1.37
> diff -u -p -r1.37 lua.port.mk
> --- lang/lua/lua.port.mk      25 Dec 2022 13:40:19 -0000      1.37
> +++ lang/lua/lua.port.mk      14 Sep 2023 13:05:28 -0000
> @@ -58,6 +58,8 @@ MODLUA_DEP =                lua${MODLUA_DEP_VERSION}
>  MODLUA_WANTLIB =     lua${MODLUA_VERSION}
>  MODLUA_LIB =         -l${MODLUA_WANTLIB}
>  
> +CHECK_LIB_DEPENDS_ARGS += -S MODLUA_WANTLIB="${MODLUA_WANTLIB}"
> +
>  _MODLUA_RUN_DEPENDS =        lang/lua/${MODLUA_VERSION}
>  
>  MODLUA_LIB_DEPENDS = ${_MODLUA_RUN_DEPENDS}

> -----------------------------------------------
> commit beb07533b4020698cd5686ed67fe6afb888e62ce
> from: Omar Polo <[email protected]>
> date: Thu Sep 14 12:58:27 2023 UTC
>  
>  pending espie@
>  
> diff 817f9e342421490cb07dac6595511380a144bd02 
> beb07533b4020698cd5686ed67fe6afb888e62ce
> commit - 817f9e342421490cb07dac6595511380a144bd02
> commit + beb07533b4020698cd5686ed67fe6afb888e62ce
> blob - 00ec6c3f81fcf03e2222a69eabe8de1741a6e562
> blob + e9c20a2308892dd1059acfe8b546cc135e8c4e8f
> --- share/man/man5/bsd.port.mk.5
> +++ share/man/man5/bsd.port.mk.5
> @@ -1339,6 +1339,13 @@ as this can be a big performance hit, and also because
>  .Ev lib-depends-check
>  doesn't know about library subdirectories or dynamic loading through
>  .Xr dlopen 3 .
> +.It Ev CHECK_LIB_DEPENDS_ARGS
> +List of arguments for
> +.Xr check-lib-depends 1 .
> +Useful for
> +.Xr port-modules 5
> +to substitute list of libraries with a variable in
> +.Ev WANTLIB .
>  .It Ev CHECKSUMFILES
>  List of all files that need to be retrieved by
>  .Cm fetch ,
> 

Oh yes, I was okay with the source part.

Note sure mentioning port-modules is useful.
It should read "List of *extra* arguments" (emphasis mine)
because there are already mandatory arguments that you don't control
as you well know :)

Reply via email to