summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/meson/meson.inc1
-rw-r--r--meta/recipes-devtools/meson/meson/0001-Support-building-allarch-recipes-again.patch13
-rw-r--r--meta/recipes-devtools/meson/meson/disable-rpath-handling.patch26
3 files changed, 32 insertions, 8 deletions
diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc
index 32c6bfe5d3..f878695903 100644
--- a/meta/recipes-devtools/meson/meson.inc
+++ b/meta/recipes-devtools/meson/meson.inc
@@ -12,6 +12,7 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
12 file://gi-flags.patch \ 12 file://gi-flags.patch \
13 file://gtkdoc-flags.patch \ 13 file://gtkdoc-flags.patch \
14 file://0001-python-module-do-not-manipulate-the-environment-when.patch \ 14 file://0001-python-module-do-not-manipulate-the-environment-when.patch \
15 file://disable-rpath-handling.patch \
15 " 16 "
16SRC_URI[sha256sum] = "92d8afd921751261e36151643464efd3394162f69efbe8cd53e0a66b1cf395eb" 17SRC_URI[sha256sum] = "92d8afd921751261e36151643464efd3394162f69efbe8cd53e0a66b1cf395eb"
17SRC_URI[md5sum] = "31bda3519d8c0eb3438267268a78085e" 18SRC_URI[md5sum] = "31bda3519d8c0eb3438267268a78085e"
diff --git a/meta/recipes-devtools/meson/meson/0001-Support-building-allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0001-Support-building-allarch-recipes-again.patch
index f6dd230916..96be104a52 100644
--- a/meta/recipes-devtools/meson/meson/0001-Support-building-allarch-recipes-again.patch
+++ b/meta/recipes-devtools/meson/meson/0001-Support-building-allarch-recipes-again.patch
@@ -11,11 +11,11 @@ Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
11 mesonbuild/environment.py | 1 + 11 mesonbuild/environment.py | 1 +
12 1 file changed, 1 insertion(+) 12 1 file changed, 1 insertion(+)
13 13
14diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py 14Index: meson-0.47.2/mesonbuild/environment.py
15index a0580a2..712b1e8 100644 15===================================================================
16--- a/mesonbuild/environment.py 16--- meson-0.47.2.orig/mesonbuild/environment.py
17+++ b/mesonbuild/environment.py 17+++ meson-0.47.2/mesonbuild/environment.py
18@@ -73,6 +73,7 @@ from .compilers import ( 18@@ -75,6 +75,7 @@ from .compilers import (
19 build_filename = 'meson.build' 19 build_filename = 'meson.build'
20 20
21 known_cpu_families = ( 21 known_cpu_families = (
@@ -23,6 +23,3 @@ index a0580a2..712b1e8 100644
23 'aarch64', 23 'aarch64',
24 'arm', 24 'arm',
25 'e2k', 25 'e2k',
26--
272.12.0
28
diff --git a/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch b/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch
new file mode 100644
index 0000000000..4b1fb57dd4
--- /dev/null
+++ b/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch
@@ -0,0 +1,26 @@
1We need to allow our rpaths generated through the compiler flags to make it into
2our binaries. Therefore disable the meson manipulations of these unless there
3is a specific directive to do something differently in the project.
4
5RP 2018/11/23
6
7Upstream-Status: Submitted [https://github.com/mesonbuild/meson/issues/2567]
8
9Index: meson-0.47.2/mesonbuild/minstall.py
10===================================================================
11--- meson-0.47.2.orig/mesonbuild/minstall.py
12+++ meson-0.47.2/mesonbuild/minstall.py
13@@ -486,8 +486,11 @@ class Installer:
14 printed_symlink_error = True
15 if os.path.isfile(outname):
16 try:
17- depfixer.fix_rpath(outname, install_rpath, final_path,
18- install_name_mappings, verbose=False)
19+ if install_rpath:
20+ depfixer.fix_rpath(outname, install_rpath, final_path,
21+ install_name_mappings, verbose=False)
22+ else:
23+ print("RPATH changes at install time disabled")
24 except SystemExit as e:
25 if isinstance(e.code, int) and e.code == 0:
26 pass