diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2021-05-11 19:35:17 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2021-05-12 08:59:55 +0200 |
| commit | 9de0cccc1bd4daf0725ce6f384f57484fd5b4774 (patch) | |
| tree | c62533eeec0125883adad63750b92ffa3f813579 /source/d/meson/39bb5e07eab736b525abfc66eb5ad0dd626aedc6.patch | |
| parent | 69b6e95b3fd05a34488b98fe3f28e534fd7207b0 (diff) | |
| download | current-20210511193517.tar.gz current-20210511193517.tar.xz | |
Tue May 11 19:35:17 UTC 202120210511193517
a/btrfs-progs-5.12-x86_64-1.txz: Upgraded.
a/hdparm-9.62-x86_64-1.txz: Upgraded.
a/kernel-generic-5.10.36-x86_64-1.txz: Upgraded.
a/kernel-huge-5.10.36-x86_64-1.txz: Upgraded.
a/kernel-modules-5.10.36-x86_64-1.txz: Upgraded.
d/kernel-headers-5.10.36-x86-1.txz: Upgraded.
d/meson-0.58.0-x86_64-2.txz: Rebuilt.
Applied upstream fix for GNOME projects failing to build.
Some projects still require an adjustment to implicit_include_directories.
k/kernel-source-5.10.36-noarch-1.txz: Upgraded.
l/elfutils-0.184-x86_64-1.txz: Upgraded.
l/glib2-2.68.2-x86_64-1.txz: Upgraded.
n/libtirpc-1.3.2-x86_64-1.txz: Upgraded.
n/snownews-1.8-x86_64-1.txz: Upgraded.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/d/meson/39bb5e07eab736b525abfc66eb5ad0dd626aedc6.patch')
| -rw-r--r-- | source/d/meson/39bb5e07eab736b525abfc66eb5ad0dd626aedc6.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/source/d/meson/39bb5e07eab736b525abfc66eb5ad0dd626aedc6.patch b/source/d/meson/39bb5e07eab736b525abfc66eb5ad0dd626aedc6.patch new file mode 100644 index 000000000..0dab0d1e7 --- /dev/null +++ b/source/d/meson/39bb5e07eab736b525abfc66eb5ad0dd626aedc6.patch @@ -0,0 +1,39 @@ +From 39bb5e07eab736b525abfc66eb5ad0dd626aedc6 Mon Sep 17 00:00:00 2001 +From: Xavier Claessens <xavier.claessens@collabora.com> +Date: Tue, 11 May 2021 09:18:47 -0400 +Subject: [PATCH] install_scripts: Restore @SOURCE_ROOT@ and @BUILD_ROOT@ + replacements + +They are not documented for add_install_script() public API, but gnome +module relies on it internally. + +Fixes: #8744 +--- + mesonbuild/backend/backends.py | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py +index ee5f4463a5..ac6d5f0669 100644 +--- a/mesonbuild/backend/backends.py ++++ b/mesonbuild/backend/backends.py +@@ -1429,7 +1429,19 @@ def generate_target_install(self, d: InstallData) -> None: + d.targets.append(i) + + def generate_custom_install_script(self, d: InstallData) -> None: +- d.install_scripts = self.build.install_scripts ++ result: T.List[ExecutableSerialisation] = [] ++ srcdir = self.environment.get_source_dir() ++ builddir = self.environment.get_build_dir() ++ for i in self.build.install_scripts: ++ fixed_args = [] ++ for a in i.cmd_args: ++ a = a.replace('@SOURCE_ROOT@', srcdir) ++ a = a.replace('@BUILD_ROOT@', builddir) ++ fixed_args.append(a) ++ es = copy.copy(i) ++ es.cmd_args = fixed_args ++ result.append(es) ++ d.install_scripts = result + + def generate_header_install(self, d: InstallData) -> None: + incroot = self.environment.get_includedir() |