On Mon, Mar 25, 2024 at 01:03:44PM +0100, Omar Polo wrote:

> On 2024/03/22 20:12:41 +0100, Otto Moerbeek <otto@drijf.net> wrote:
> > How about this? If you think it's ok, I'll try to see what upstream thinks
> 
> the boost.py diff fails to apply for me, maybe it was generated against
> the previous version (1.3.x)?

Right, sorry, I did not pay attantion.  Below looks ok.

	-Otto

> 
> 
> Index: patches/patch-mesonbuild_dependencies_boost_py
> ===================================================================
> RCS file: /home/cvs/ports/devel/meson/patches/patch-mesonbuild_dependencies_boost_py,v
> diff -u -p -r1.1 patch-mesonbuild_dependencies_boost_py
> --- patches/patch-mesonbuild_dependencies_boost_py	25 Mar 2024 07:12:30 -0000	1.1
> +++ patches/patch-mesonbuild_dependencies_boost_py	25 Mar 2024 11:49:49 -0000
> @@ -1,13 +1,13 @@
>  Index: mesonbuild/dependencies/boost.py
>  --- mesonbuild/dependencies/boost.py.orig
>  +++ mesonbuild/dependencies/boost.py
> -@@ -609,7 +609,8 @@ class BoostDependency(SystemDependency):
> -         mlog.debug(f'Static {len(libs)}')
> +@@ -594,7 +594,8 @@ class BoostDependency(SystemDependency):
> +         # mlog.debug('    - vscrt: {}'.format(vscrt))
> +         libs = [x for x in libs if x.static == self.static or not self.explicit_static]
>           libs = [x for x in libs if x.mt == self.multithreading]
> -         mlog.debug(f'MT {len(libs)}')
>  -        libs = [x for x in libs if x.version_matches(lib_vers)]
>  +        if not mesonlib.is_openbsd():
>  +            libs = [x for x in libs if x.version_matches(lib_vers)]
> -         mlog.debug(f'Vers {len(libs)} {lib_vers}')
>           libs = [x for x in libs if x.arch_matches(self.arch)]
> -         mlog.debug(f'Arch {len(libs)}')
> +         libs = [x for x in libs if x.vscrt_matches(vscrt)]
> +         libs = [x for x in libs if x.nvsuffix != 'dll']  # Only link to import libraries
> 
>