diff options
Diffstat (limited to 'meta/recipes-devtools/meson/meson/cross-libdir.patch')
-rw-r--r-- | meta/recipes-devtools/meson/meson/cross-libdir.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/meta/recipes-devtools/meson/meson/cross-libdir.patch b/meta/recipes-devtools/meson/meson/cross-libdir.patch deleted file mode 100644 index 7395fdbdaa..0000000000 --- a/meta/recipes-devtools/meson/meson/cross-libdir.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
3 | |||
4 | From ce24f0d6a9be22ba61d80cd254e0409de2eaffd7 Mon Sep 17 00:00:00 2001 | ||
5 | From: Jussi Pakkanen <jpakkane@gmail.com> | ||
6 | Date: Thu, 27 Dec 2018 23:43:35 +0200 | ||
7 | Subject: [PATCH] Default libdir is "lib" when cross compiling. Closes #2535. | ||
8 | |||
9 | --- | ||
10 | diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py | ||
11 | index ff810683..9ee23a69 100644 | ||
12 | --- a/mesonbuild/coredata.py | ||
13 | +++ b/mesonbuild/coredata.py | ||
14 | @@ -298,6 +298,7 @@ class CoreData: | ||
15 | # Only to print a warning if it changes between Meson invocations. | ||
16 | self.pkgconf_envvar = os.environ.get('PKG_CONFIG_PATH', '') | ||
17 | self.config_files = self.__load_config_files(options.native_file) | ||
18 | + self.libdir_cross_fixup() | ||
19 | |||
20 | @staticmethod | ||
21 | def __load_config_files(filenames): | ||
22 | @@ -309,6 +310,13 @@ class CoreData: | ||
23 | for f in filenames] | ||
24 | return filenames | ||
25 | |||
26 | + def libdir_cross_fixup(self): | ||
27 | + # By default set libdir to "lib" when cross compiling since | ||
28 | + # getting the "system default" is always wrong on multiarch | ||
29 | + # platforms as it gets a value like lib/x86_64-linux-gnu. | ||
30 | + if self.cross_files: | ||
31 | + self.builtins['libdir'].value = 'lib' | ||
32 | + | ||
33 | def sanitize_prefix(self, prefix): | ||
34 | if not os.path.isabs(prefix): | ||
35 | raise MesonException('prefix value {!r} must be an absolute path' | ||