Skip to contentSkip to conversation

package/pkg-meson: Fix deprecation warnings in cross-compilation config

PATCH New Gleb Mazovetskiy 2 participants 2 messages Dec 27, 2020 – Dec 28, 2020 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/pkg-meson: Fix deprecation warnings in cross-compilation config

As of meson 0.56.0, <lang>_args and <lang>_link_args in the [properties] section are deprecated and should be placed in the [built-in options] section instead.

Source: https://mesonbuild.com/Machine-files.html#properties

Fixes the following deprecation warnings:

Quoted 4 lines

DEPRECATION: c_args in the [properties] section of the machine file is deprecated, use the [built-in options] section.
DEPRECATION: c_link_args in the [properties] section of the machine file is deprecated, use the [built-in options] section.
DEPRECATION: cpp_args in the [properties] section of the machine file is deprecated, use the [built-in options] section.
DEPRECATION: cpp_link_args in the [properties] section of the machine file is deprecated, use the [built-in options] section.

---
 package/meson/cross-compilation.conf.in | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
package/meson/cross-compilation.conf.in +4 -2
index 1880051315..37b49eea3b 100644
@@ -12,12 +12,14 @@ pkgconfig = '@HOST_DIR@/bin/pkgconf'
 g-ir-compiler = '@STAGING_DIR@/usr/bin/g-ir-compiler'
 g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner'
 
-[properties]
-needs_exe_wrapper = true
+[built-in options]
 c_args = [@TARGET_CFLAGS@]
 c_link_args = [@TARGET_LDFLAGS@]
 cpp_args = [@TARGET_CXXFLAGS@]
 cpp_link_args = [@TARGET_LDFLAGS@]
+
+[properties]
+needs_exe_wrapper = true
 sys_root = '@STAGING_DIR@'
 pkg_config_libdir = '@STAGING_DIR@/usr/lib/pkgconfig:@STAGING_DIR@/usr/share/pkgconfig'
 pkg_config_static = '@STATIC@'
Signature · 1 line
2.27.0
#1 lore raw

PATCH 1/1 package/pkg-meson: Fix deprecation warnings in cross-compilation config

Quoted 11 lines · On Sun, 27 Dec 2020 02:15:05 +0000 Gleb Mazovetskiy <[email protected]> wrote:

As of meson 0.56.0, <lang>_args and <lang>_link_args in the [properties] section are deprecated and should be placed in the [built-in options] section instead.

Source: https://mesonbuild.com/Machine-files.html#properties

Fixes the following deprecation warnings:

Quoted 4 lines

DEPRECATION: c_args in the [properties] section of the machine file is deprecated, use the [built-in options] section.
DEPRECATION: c_link_args in the [properties] section of the machine file is deprecated, use the [built-in options] section.
DEPRECATION: cpp_args in the [properties] section of the machine file is deprecated, use the [built-in options] section.
DEPRECATION: cpp_link_args in the [properties] section of the machine file is deprecated, use the [built-in options] section.

Quoted 4 lines
---
 package/meson/cross-compilation.conf.in | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com