diff options
Diffstat (limited to 'meta/recipes-devtools/meson/meson/0003-native_bindir.patch')
-rw-r--r-- | meta/recipes-devtools/meson/meson/0003-native_bindir.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch index 76c1aa9ac1..dc822fb1fc 100644 --- a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch +++ b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From af2554b9b08af973181b4e4181bd1cb936fdbb8f Mon Sep 17 00:00:00 2001 | 1 | From e76726321067748362b39937bd1e663a1a948ad5 Mon Sep 17 00:00:00 2001 |
2 | From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> | 2 | From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> |
3 | Date: Wed, 15 Nov 2017 15:05:01 +0100 | 3 | Date: Wed, 15 Nov 2017 15:05:01 +0100 |
4 | Subject: [PATCH] native_bindir | 4 | Subject: [PATCH] native_bindir |
@@ -22,7 +22,7 @@ Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> | |||
22 | 2 files changed, 14 insertions(+), 11 deletions(-) | 22 | 2 files changed, 14 insertions(+), 11 deletions(-) |
23 | 23 | ||
24 | diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py | 24 | diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py |
25 | index f17b9f2..b5c9c92 100644 | 25 | index 40e304c..4b687df 100644 |
26 | --- a/mesonbuild/dependencies/base.py | 26 | --- a/mesonbuild/dependencies/base.py |
27 | +++ b/mesonbuild/dependencies/base.py | 27 | +++ b/mesonbuild/dependencies/base.py |
28 | @@ -184,7 +184,7 @@ class Dependency: | 28 | @@ -184,7 +184,7 @@ class Dependency: |
@@ -73,7 +73,7 @@ index f17b9f2..b5c9c92 100644 | |||
73 | + cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env, use_native) | 73 | + cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env, use_native) |
74 | return cache[(self.pkgbin, targs, fenv)] | 74 | return cache[(self.pkgbin, targs, fenv)] |
75 | 75 | ||
76 | def _convert_mingw_paths(self, args: List[str]) -> List[str]: | 76 | def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]: |
77 | @@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency): | 77 | @@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency): |
78 | (self.name, out_raw)) | 78 | (self.name, out_raw)) |
79 | self.link_args, self.raw_link_args = self._search_libs(out, out_raw) | 79 | self.link_args, self.raw_link_args = self._search_libs(out, out_raw) |
@@ -93,7 +93,7 @@ index f17b9f2..b5c9c92 100644 | |||
93 | if ret != 0: | 93 | if ret != 0: |
94 | if self.required: | 94 | if self.required: |
95 | diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py | 95 | diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py |
96 | index bdcc4a7..e2de847 100644 | 96 | index da411ef..856506a 100644 |
97 | --- a/mesonbuild/dependencies/ui.py | 97 | --- a/mesonbuild/dependencies/ui.py |
98 | +++ b/mesonbuild/dependencies/ui.py | 98 | +++ b/mesonbuild/dependencies/ui.py |
99 | @@ -330,7 +330,7 @@ class QtBaseDependency(ExternalDependency): | 99 | @@ -330,7 +330,7 @@ class QtBaseDependency(ExternalDependency): |
@@ -105,7 +105,7 @@ index bdcc4a7..e2de847 100644 | |||
105 | if prefix: | 105 | if prefix: |
106 | self.bindir = os.path.join(prefix, 'bin') | 106 | self.bindir = os.path.join(prefix, 'bin') |
107 | 107 | ||
108 | @@ -507,7 +507,7 @@ class Qt4Dependency(QtBaseDependency): | 108 | @@ -508,7 +508,7 @@ class Qt4Dependency(QtBaseDependency): |
109 | applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease'] | 109 | applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease'] |
110 | for application in applications: | 110 | for application in applications: |
111 | try: | 111 | try: |
@@ -114,7 +114,7 @@ index bdcc4a7..e2de847 100644 | |||
114 | except MesonException: | 114 | except MesonException: |
115 | pass | 115 | pass |
116 | 116 | ||
117 | @@ -517,7 +517,7 @@ class Qt5Dependency(QtBaseDependency): | 117 | @@ -518,7 +518,7 @@ class Qt5Dependency(QtBaseDependency): |
118 | QtBaseDependency.__init__(self, 'qt5', env, kwargs) | 118 | QtBaseDependency.__init__(self, 'qt5', env, kwargs) |
119 | 119 | ||
120 | def get_pkgconfig_host_bins(self, core): | 120 | def get_pkgconfig_host_bins(self, core): |