754a39b491
* 0004-fix-gtk-doc.patch: refresh * the other PR is included in the new release Fixes #24204
49 lines
1.7 KiB
Diff
49 lines
1.7 KiB
Diff
--- meson-1.8.1/mesonbuild/scripts/gtkdochelper.py.orig 2025-05-23 23:51:05.000000000 +0200
|
|
+++ meson-1.8.1/mesonbuild/scripts/gtkdochelper.py 2025-05-24 00:25:29.262973900 +0200
|
|
@@ -9,7 +9,7 @@
|
|
import argparse
|
|
from ..mesonlib import (
|
|
MesonException, Popen_safe, is_windows, is_cygwin, is_parent_path,
|
|
- split_args,
|
|
+ join_args, split_args,
|
|
)
|
|
from . import destdir_join
|
|
import typing as T
|
|
@@ -59,7 +59,7 @@
|
|
library_paths.extend(env['LD_LIBRARY_PATH'].split(os.pathsep))
|
|
env['LD_LIBRARY_PATH'] = os.pathsep.join(library_paths)
|
|
|
|
- if is_windows():
|
|
+ if is_windows() and not shutil.which(cmd[0]):
|
|
cmd.insert(0, sys.executable)
|
|
|
|
# Put stderr into stdout since we want to print it out anyway.
|
|
@@ -143,6 +143,15 @@
|
|
|
|
if gobject_typesfile:
|
|
scanobjs_cmd = [options.gtkdoc_scangobj] + scanobjs_args
|
|
+
|
|
+ library_paths = []
|
|
+ for ldflag in split_args(ldflags):
|
|
+ if ldflag.startswith('-Wl,-rpath,'):
|
|
+ library_paths.append(ldflag[11:])
|
|
+
|
|
+ if is_windows():
|
|
+ ldflags = join_args((arg for arg in split_args(ldflags) if not arg.startswith('-Wl,-rpath,')))
|
|
+
|
|
scanobjs_cmd += ['--types=' + gobject_typesfile,
|
|
'--module=' + module,
|
|
'--run=' + run,
|
|
@@ -152,11 +161,6 @@
|
|
'--ld=' + ld,
|
|
'--output-dir=' + abs_out]
|
|
|
|
- library_paths = []
|
|
- for ldflag in split_args(ldflags):
|
|
- if ldflag.startswith('-Wl,-rpath,'):
|
|
- library_paths.append(ldflag[11:])
|
|
-
|
|
gtkdoc_run_check(scanobjs_cmd, build_root, library_paths)
|
|
|
|
# Make docbook files
|