diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /poky/meta/recipes-devtools/meson/nativesdk-meson_0.47.2.bb | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-devtools/meson/nativesdk-meson_0.47.2.bb')
-rw-r--r-- | poky/meta/recipes-devtools/meson/nativesdk-meson_0.47.2.bb | 74 |
1 files changed, 0 insertions, 74 deletions
diff --git a/poky/meta/recipes-devtools/meson/nativesdk-meson_0.47.2.bb b/poky/meta/recipes-devtools/meson/nativesdk-meson_0.47.2.bb deleted file mode 100644 index 53503aa99..000000000 --- a/poky/meta/recipes-devtools/meson/nativesdk-meson_0.47.2.bb +++ /dev/null @@ -1,74 +0,0 @@ -include meson.inc - -inherit nativesdk - -SRC_URI += "file://meson-setup.py \ - file://meson-wrapper" - -def meson_array(var, d): - return "', '".join(d.getVar(var).split()).join(("'", "'")) - -# both are required but not used by meson -MESON_SDK_ENDIAN = "bogus-endian" -MESON_TARGET_ENDIAN = "bogus-endian" - -MESON_TOOLCHAIN_ARGS = "${BUILDSDK_CC_ARCH}${TOOLCHAIN_OPTIONS}" -MESON_C_ARGS = "${MESON_TOOLCHAIN_ARGS} ${BUILDSDK_CFLAGS}" -MESON_CPP_ARGS = "${MESON_TOOLCHAIN_ARGS} ${BUILDSDK_CXXFLAGS}" -MESON_LINK_ARGS = "${MESON_TOOLCHAIN_ARGS} ${BUILDSDK_LDFLAGS}" - -# This 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. -addtask write_config before do_install -do_write_config[vardeps] += "MESON_C_ARGS MESON_CPP_ARGS MESON_LINK_ARGS CC CXX LD AR NM STRIP READELF" -do_write_config() { - # This needs to be Py to split the args into single-element lists - cat >${WORKDIR}/meson.cross <<EOF -[binaries] -c = @@CC@@ -cpp = @@CXX@@ -ar = @@AR@@ -nm = @@NM@@ -ld = @@LD@@ -strip = @@STRIP@@ -pkgconfig = 'pkg-config' - -[properties] -needs_exe_wrapper = true -c_args = @@CFLAGS@@ -c_link_args = @@LDFLAGS@@ -cpp_args = @@CPPFLAGS@@ -cpp_link_args = @@LDFLAGS@@ - -[host_machine] -system = '${SDK_OS}' -cpu_family = '${SDK_ARCH}' -cpu = '${SDK_ARCH}' -endian = '${MESON_SDK_ENDIAN}' -EOF -} - -do_install_append() { - install -d ${D}${datadir}/meson - install -m 0644 ${WORKDIR}/meson.cross ${D}${datadir}/meson/ - - 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-core \ - nativesdk-python3-misc \ - nativesdk-python3-modules \ - " - -FILES_${PN} += "${datadir}/meson ${SDKPATHNATIVE}" |