mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
meson: fold nativesdk into the main recipe
This allows automated version updates when possible, and reduces friction in manual ones. (From OE-Core rev: 54d4a767ab7beaa64cfc4c221317ea03b0b119ab) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
committed by
Richard Purdie
Richard Purdie
parent
4f24d5daa6
commit
bc0c43cf16
@@ -524,7 +524,6 @@ RECIPE_MAINTAINER:pn-nasm = "Richard Purdie <richard.purdie@linuxfoundation.org>
|
||||
RECIPE_MAINTAINER:pn-nativesdk-buildtools-perl-dummy = "Richard Purdie <richard.purdie@linuxfoundation.org>"
|
||||
RECIPE_MAINTAINER:pn-nativesdk-icecc-toolchain = "Joshua Watt <JPEWhacker@gmail.com>"
|
||||
RECIPE_MAINTAINER:pn-nativesdk-libtool = "Richard Purdie <richard.purdie@linuxfoundation.org>"
|
||||
RECIPE_MAINTAINER:pn-nativesdk-meson = "Alexander Kanavin <alex.kanavin@gmail.com>"
|
||||
RECIPE_MAINTAINER:pn-nativesdk-packagegroup-sdk-host = "Ross Burton <ross.burton@arm.com>"
|
||||
RECIPE_MAINTAINER:pn-nativesdk-qemu-helper = "Richard Purdie <richard.purdie@linuxfoundation.org>"
|
||||
RECIPE_MAINTAINER:pn-nativesdk-sdk-provides-dummy = "Richard Purdie <richard.purdie@linuxfoundation.org>"
|
||||
|
||||
@@ -1,37 +0,0 @@
|
||||
HOMEPAGE = "http://mesonbuild.com"
|
||||
SUMMARY = "A high performance build system"
|
||||
DESCRIPTION = "Meson is a build system designed to increase programmer \
|
||||
productivity. It does this by providing a fast, simple and easy to use \
|
||||
interface for modern software development tools and practices."
|
||||
|
||||
LICENSE = "Apache-2.0"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57"
|
||||
|
||||
SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${PV}.tar.gz \
|
||||
file://0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch \
|
||||
file://0001-python-module-do-not-manipulate-the-environment-when.patch \
|
||||
file://disable-rpath-handling.patch \
|
||||
file://0001-Make-CPU-family-warnings-fatal.patch \
|
||||
file://0002-Support-building-allarch-recipes-again.patch \
|
||||
file://0001-is_debianlike-always-return-False.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "87ca5fa9358a01864529392bd64e027158eb94afca7c7766b1866ef27eccb98e"
|
||||
|
||||
UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases"
|
||||
UPSTREAM_CHECK_REGEX = "meson-(?P<pver>\d+(\.\d+)+)\.tar"
|
||||
|
||||
inherit setuptools3
|
||||
|
||||
RDEPENDS:${PN} = "ninja python3-modules python3-pkg-resources"
|
||||
|
||||
FILES:${PN} += "${datadir}/polkit-1"
|
||||
|
||||
do_install:append () {
|
||||
# As per the same issue in the python recipe itself:
|
||||
# Unfortunately the following pyc files are non-deterministc due to 'frozenset'
|
||||
# being written without strict ordering, even with PYTHONHASHSEED = 0
|
||||
# Upstream is discussing ways to solve the issue properly, until then let's
|
||||
# just not install the problematic files.
|
||||
# More info: http://benno.id.au/blog/2013/01/15/python-determinism
|
||||
rm ${D}${libdir}/python*/site-packages/mesonbuild/dependencies/__pycache__/mpi.cpython*
|
||||
}
|
||||
@@ -1,4 +1,135 @@
|
||||
include meson.inc
|
||||
HOMEPAGE = "http://mesonbuild.com"
|
||||
SUMMARY = "A high performance build system"
|
||||
DESCRIPTION = "Meson is a build system designed to increase programmer \
|
||||
productivity. It does this by providing a fast, simple and easy to use \
|
||||
interface for modern software development tools and practices."
|
||||
|
||||
BBCLASSEXTEND = "native"
|
||||
LICENSE = "Apache-2.0"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57"
|
||||
|
||||
SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${PV}.tar.gz \
|
||||
file://0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch \
|
||||
file://0001-python-module-do-not-manipulate-the-environment-when.patch \
|
||||
file://disable-rpath-handling.patch \
|
||||
file://0001-Make-CPU-family-warnings-fatal.patch \
|
||||
file://0002-Support-building-allarch-recipes-again.patch \
|
||||
file://0001-is_debianlike-always-return-False.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "87ca5fa9358a01864529392bd64e027158eb94afca7c7766b1866ef27eccb98e"
|
||||
|
||||
UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases"
|
||||
UPSTREAM_CHECK_REGEX = "meson-(?P<pver>\d+(\.\d+)+)\.tar"
|
||||
|
||||
inherit setuptools3
|
||||
|
||||
RDEPENDS:${PN} = "ninja python3-modules python3-pkg-resources"
|
||||
|
||||
FILES:${PN} += "${datadir}/polkit-1"
|
||||
|
||||
do_install:append () {
|
||||
# As per the same issue in the python recipe itself:
|
||||
# Unfortunately the following pyc files are non-deterministc due to 'frozenset'
|
||||
# being written without strict ordering, even with PYTHONHASHSEED = 0
|
||||
# Upstream is discussing ways to solve the issue properly, until then let's
|
||||
# just not install the problematic files.
|
||||
# More info: http://benno.id.au/blog/2013/01/15/python-determinism
|
||||
rm ${D}${libdir}/python*/site-packages/mesonbuild/dependencies/__pycache__/mpi.cpython*
|
||||
}
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
||||
inherit meson-routines
|
||||
|
||||
SRC_URI:append:class-nativesdk = " file://meson-setup.py \
|
||||
file://meson-wrapper"
|
||||
|
||||
# The cross file logic is similar but not identical to that in meson.bbclass,
|
||||
# since it's generating for an SDK rather than a cross-compile. Important
|
||||
# differences are:
|
||||
# - We can't set vars like CC, CXX, etc. yet because they will be filled in with
|
||||
# real paths by meson-setup.sh when the SDK is extracted.
|
||||
# - Some overrides aren't needed, since the SDK injects paths that take care of
|
||||
# them.
|
||||
def var_list2str(var, d):
|
||||
items = d.getVar(var).split()
|
||||
return items[0] if len(items) == 1 else ', '.join(repr(s) for s in items)
|
||||
|
||||
def generate_native_link_template(d):
|
||||
val = ['-L@{OECORE_NATIVE_SYSROOT}${libdir_native}',
|
||||
'-L@{OECORE_NATIVE_SYSROOT}${base_libdir_native}',
|
||||
'-Wl,-rpath-link,@{OECORE_NATIVE_SYSROOT}${libdir_native}',
|
||||
'-Wl,-rpath-link,@{OECORE_NATIVE_SYSROOT}${base_libdir_native}',
|
||||
'-Wl,--allow-shlib-undefined'
|
||||
]
|
||||
build_arch = d.getVar('BUILD_ARCH')
|
||||
if 'x86_64' in build_arch:
|
||||
loader = 'ld-linux-x86-64.so.2'
|
||||
elif 'i686' in build_arch:
|
||||
loader = 'ld-linux.so.2'
|
||||
elif 'aarch64' in build_arch:
|
||||
loader = 'ld-linux-aarch64.so.1'
|
||||
elif 'ppc64le' in build_arch:
|
||||
loader = 'ld64.so.2'
|
||||
|
||||
if loader:
|
||||
val += ['-Wl,--dynamic-linker=@{OECORE_NATIVE_SYSROOT}${base_libdir_native}/' + loader]
|
||||
|
||||
return repr(val)
|
||||
|
||||
do_install:append:class-nativesdk() {
|
||||
install -d ${D}${datadir}/meson
|
||||
|
||||
cat >${D}${datadir}/meson/meson.native.template <<EOF
|
||||
[binaries]
|
||||
c = ${@meson_array('BUILD_CC', d)}
|
||||
cpp = ${@meson_array('BUILD_CXX', d)}
|
||||
ar = ${@meson_array('BUILD_AR', d)}
|
||||
nm = ${@meson_array('BUILD_NM', d)}
|
||||
strip = ${@meson_array('BUILD_STRIP', d)}
|
||||
readelf = ${@meson_array('BUILD_READELF', d)}
|
||||
pkgconfig = 'pkg-config-native'
|
||||
|
||||
[built-in options]
|
||||
c_args = ['-isystem@{OECORE_NATIVE_SYSROOT}${includedir_native}' , ${@var_list2str('BUILD_OPTIMIZATION', d)}]
|
||||
c_link_args = ${@generate_native_link_template(d)}
|
||||
cpp_args = ['-isystem@{OECORE_NATIVE_SYSROOT}${includedir_native}' , ${@var_list2str('BUILD_OPTIMIZATION', d)}]
|
||||
cpp_link_args = ${@generate_native_link_template(d)}
|
||||
[properties]
|
||||
sys_root = '@OECORE_NATIVE_SYSROOT'
|
||||
EOF
|
||||
|
||||
cat >${D}${datadir}/meson/meson.cross.template <<EOF
|
||||
[binaries]
|
||||
c = @CC
|
||||
cpp = @CXX
|
||||
ar = @AR
|
||||
nm = @NM
|
||||
strip = @STRIP
|
||||
pkgconfig = 'pkg-config'
|
||||
|
||||
[built-in options]
|
||||
c_args = @CFLAGS
|
||||
c_link_args = @LDFLAGS
|
||||
cpp_args = @CPPFLAGS
|
||||
cpp_link_args = @LDFLAGS
|
||||
|
||||
[properties]
|
||||
needs_exe_wrapper = true
|
||||
sys_root = @OECORE_TARGET_SYSROOT
|
||||
|
||||
[host_machine]
|
||||
system = '${SDK_OS}'
|
||||
cpu_family = '${@meson_cpu_family("SDK_ARCH", d)}'
|
||||
cpu = '${SDK_ARCH}'
|
||||
endian = '${@meson_endian("SDK", d)}'
|
||||
EOF
|
||||
|
||||
install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d
|
||||
install -m 0755 ${WORKDIR}/meson-setup.py ${D}${SDKPATHNATIVE}/post-relocate-setup.d/
|
||||
|
||||
# We need to wrap the real meson with a thin env setup wrapper.
|
||||
mv ${D}${bindir}/meson ${D}${bindir}/meson.real
|
||||
install -m 0755 ${WORKDIR}/meson-wrapper ${D}${bindir}/meson
|
||||
}
|
||||
|
||||
FILES:${PN}:append:class-nativesdk = "${datadir}/meson ${SDKPATHNATIVE}"
|
||||
|
||||
@@ -1,104 +0,0 @@
|
||||
include meson.inc
|
||||
|
||||
inherit meson-routines
|
||||
inherit nativesdk
|
||||
|
||||
SRC_URI += "file://meson-setup.py \
|
||||
file://meson-wrapper"
|
||||
|
||||
# The cross file logic is similar but not identical to that in meson.bbclass,
|
||||
# since it's generating for an SDK rather than a cross-compile. Important
|
||||
# differences are:
|
||||
# - We can't set vars like CC, CXX, etc. yet because they will be filled in with
|
||||
# real paths by meson-setup.sh when the SDK is extracted.
|
||||
# - Some overrides aren't needed, since the SDK injects paths that take care of
|
||||
# them.
|
||||
def var_list2str(var, d):
|
||||
items = d.getVar(var).split()
|
||||
return items[0] if len(items) == 1 else ', '.join(repr(s) for s in items)
|
||||
|
||||
def generate_native_link_template(d):
|
||||
val = ['-L@{OECORE_NATIVE_SYSROOT}${libdir_native}',
|
||||
'-L@{OECORE_NATIVE_SYSROOT}${base_libdir_native}',
|
||||
'-Wl,-rpath-link,@{OECORE_NATIVE_SYSROOT}${libdir_native}',
|
||||
'-Wl,-rpath-link,@{OECORE_NATIVE_SYSROOT}${base_libdir_native}',
|
||||
'-Wl,--allow-shlib-undefined'
|
||||
]
|
||||
build_arch = d.getVar('BUILD_ARCH')
|
||||
if 'x86_64' in build_arch:
|
||||
loader = 'ld-linux-x86-64.so.2'
|
||||
elif 'i686' in build_arch:
|
||||
loader = 'ld-linux.so.2'
|
||||
elif 'aarch64' in build_arch:
|
||||
loader = 'ld-linux-aarch64.so.1'
|
||||
elif 'ppc64le' in build_arch:
|
||||
loader = 'ld64.so.2'
|
||||
|
||||
if loader:
|
||||
val += ['-Wl,--dynamic-linker=@{OECORE_NATIVE_SYSROOT}${base_libdir_native}/' + loader]
|
||||
|
||||
return repr(val)
|
||||
|
||||
do_install:append() {
|
||||
install -d ${D}${datadir}/meson
|
||||
|
||||
cat >${D}${datadir}/meson/meson.native.template <<EOF
|
||||
[binaries]
|
||||
c = ${@meson_array('BUILD_CC', d)}
|
||||
cpp = ${@meson_array('BUILD_CXX', d)}
|
||||
ar = ${@meson_array('BUILD_AR', d)}
|
||||
nm = ${@meson_array('BUILD_NM', d)}
|
||||
strip = ${@meson_array('BUILD_STRIP', d)}
|
||||
readelf = ${@meson_array('BUILD_READELF', d)}
|
||||
pkgconfig = 'pkg-config-native'
|
||||
|
||||
[built-in options]
|
||||
c_args = ['-isystem@{OECORE_NATIVE_SYSROOT}${includedir_native}' , ${@var_list2str('BUILD_OPTIMIZATION', d)}]
|
||||
c_link_args = ${@generate_native_link_template(d)}
|
||||
cpp_args = ['-isystem@{OECORE_NATIVE_SYSROOT}${includedir_native}' , ${@var_list2str('BUILD_OPTIMIZATION', d)}]
|
||||
cpp_link_args = ${@generate_native_link_template(d)}
|
||||
[properties]
|
||||
sys_root = '@OECORE_NATIVE_SYSROOT'
|
||||
EOF
|
||||
|
||||
cat >${D}${datadir}/meson/meson.cross.template <<EOF
|
||||
[binaries]
|
||||
c = @CC
|
||||
cpp = @CXX
|
||||
ar = @AR
|
||||
nm = @NM
|
||||
strip = @STRIP
|
||||
pkgconfig = 'pkg-config'
|
||||
|
||||
[built-in options]
|
||||
c_args = @CFLAGS
|
||||
c_link_args = @LDFLAGS
|
||||
cpp_args = @CPPFLAGS
|
||||
cpp_link_args = @LDFLAGS
|
||||
|
||||
[properties]
|
||||
needs_exe_wrapper = true
|
||||
sys_root = @OECORE_TARGET_SYSROOT
|
||||
|
||||
[host_machine]
|
||||
system = '${SDK_OS}'
|
||||
cpu_family = '${@meson_cpu_family("SDK_ARCH", d)}'
|
||||
cpu = '${SDK_ARCH}'
|
||||
endian = '${@meson_endian("SDK", d)}'
|
||||
EOF
|
||||
|
||||
install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d
|
||||
install -m 0755 ${WORKDIR}/meson-setup.py ${D}${SDKPATHNATIVE}/post-relocate-setup.d/
|
||||
|
||||
# We need to wrap the real meson with a thin env setup wrapper.
|
||||
mv ${D}${bindir}/meson ${D}${bindir}/meson.real
|
||||
install -m 0755 ${WORKDIR}/meson-wrapper ${D}${bindir}/meson
|
||||
}
|
||||
|
||||
RDEPENDS:${PN} += "\
|
||||
nativesdk-ninja \
|
||||
nativesdk-python3 \
|
||||
nativesdk-python3-setuptools \
|
||||
"
|
||||
|
||||
FILES:${PN} += "${datadir}/meson ${SDKPATHNATIVE}"
|
||||
Reference in New Issue
Block a user