Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Misc fixes #13017

Merged
merged 4 commits into from
Apr 15, 2024
Merged

Misc fixes #13017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
39f6d11
micro-optimize iteration of evaluated set
eli-schwartz Mar 19, 2024
c99fc40
compilers: fix crash when compiler check returns None output
eli-schwartz Mar 24, 2024
f9eef40
allow any alternative python freeze tool to work with meson
eli-schwartz Mar 27, 2024
1baabbc
tests: fix missing dependency causing flaky build failure
eli-schwartz Mar 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mesonbuild/coredata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -923,7 +923,7 @@ def update_project_options(self, options: 'MutableKeyedOptionDictType', subproje
fatal=False)

# Find any extranious keys for this project and remove them
for key in list(self.options.keys() - options.keys()):
for key in self.options.keys() - options.keys():
if key.is_project() and key.subproject == subproject:
del self.options[key]

Expand Down
9 changes: 6 additions & 3 deletions mesonbuild/utils/universal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,11 @@ class _VerPickleLoadable(Protocol):

from glob import glob

if getattr(sys, 'frozen', False) and hasattr(sys, '_MEIPASS'):
# using a PyInstaller bundle, e.g. the MSI installed executable
if getattr(sys, 'frozen', False):
# Using e.g. a PyInstaller bundle, such as the MSI installed executable.
# It is conventional for freeze programs to set this attribute to indicate
# that the program is self hosted, and for example there is no associated
# "python" executable.
python_command = [sys.executable, 'runpython']
else:
python_command = [sys.executable]
Expand Down Expand Up @@ -1587,7 +1590,7 @@ def Popen_safe_logged(args: T.List[str], msg: str = 'Called', **kwargs: T.Any) -
mlog.debug(f'{msg}: `{join_args(args)}` -> {excp}')
raise

rc, out, err = p.returncode, o.strip(), e.strip()
rc, out, err = p.returncode, o.strip() if o else None, e.strip() if e else None
mlog.debug('-----------')
mlog.debug(f'{msg}: `{join_args(args)}` -> {rc}')
if out:
Expand Down
4 changes: 2 additions & 2 deletions test cases/rust/12 bindgen/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,9 @@ if prog_bindgen.version().version_compare('>= 0.65')
input : 'src/header3.h',
output : 'header3.rs',
output_inline_wrapper : 'header3.c',
include_directories : 'include',
include_directories : inc,
)
c_inline_wrapper = static_library('c_wrapper', gen3[1])
c_inline_wrapper = static_library('c_wrapper', gen3[1], include_directories: inc)

f = configure_file(
input : 'src/main3.rs',
Expand Down
Loading