Skip to content

Commit

Permalink
Revert "backends: Cache creation of install data"
Browse files Browse the repository at this point in the history
This reverts commit 904b470.

This is not a real bottleneck, and we want to create it thrice -- once
before the backend is generated. The final install data needs to be
created fresh.

Update unittest to demonstrate the issue.

Fixes https://bugs.gentoo.org/910050
  • Loading branch information
eli-schwartz authored and jpakkane committed Jul 10, 2023
1 parent ecbba0c commit 4166bf1
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 1 deletion.
1 change: 0 additions & 1 deletion mesonbuild/backend/backends.py
Expand Up @@ -1605,7 +1605,6 @@ def run_postconf_scripts(self) -> None:
mlog.log(f'Running postconf script {name!r}')
run_exe(s, env)

@lru_cache(maxsize=1)
def create_install_data(self) -> InstallData:
strip_bin = self.environment.lookup_binary_entry(MachineChoice.HOST, 'strip')
if strip_bin is None:
Expand Down
Empty file.
Expand Up @@ -2,6 +2,8 @@ project('built library', 'c')

cc = meson.get_compiler('c')

import('python').find_installation().install_sources('foo.py')

if host_machine.system() != 'cygwin'
# bar_in_system has undefined symbols, but still must be found
bar_system_dep = cc.find_library('bar_in_system')
Expand Down

0 comments on commit 4166bf1

Please sign in to comment.