brl/citadel
1
0
Fork 2
Code Issues Pull Requests 2 Packages Projects Releases Wiki Activity

Changes for compilation with updated poky tree

Browse Source
This commit is contained in:
Bruce Leidl 2018-03-02 12:13:18 -05:00
parent 13f7e03e8a
commit bfa3db4bf4
13 changed files with 31 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
meta-citadel-distro/classes/meson.bbclass
View File

@ -1,106 +0,0 @@
inherit python3native
DEPENDS_append = " meson-native ninja-native"
# As Meson enforces out-of-tree builds we can just use cleandirs
B = "${WORKDIR}/build"
do_configure[cleandirs] = "${B}"
# Where the meson.build build configuration is
MESON_SOURCEPATH = "${S}"
# These variables in the environment override the *native* tools, not the cross.
export CPPFLAGS = "${BUILD_CPPFLAGS}"
export CC = "${BUILD_CC}"
export CFLAGS = "${BUILD_CFLAGS}"
export CXX = "${BUILD_CXX}"
export CXXFLAGS = "${BUILD_CXXFLAGS}"
export LD = "${BUILD_LD}"
export LDFLAGS = "${BUILD_LDFLAGS}"
export AR = "${BUILD_AR}"
export PKG_CONFIG = "pkg-config-native"
def noprefix(var, d):
return d.getVar(var, True).replace(d.getVar('prefix', True) + '/', '', 1)
MESONOPTS = " --prefix ${prefix} \
--bindir ${@noprefix('bindir', d)} \
--sbindir ${@noprefix('sbindir', d)} \
--datadir ${@noprefix('datadir', d)} \
--libdir ${@noprefix('libdir', d)} \
--libexecdir ${@noprefix('libexecdir', d)} \
--includedir ${@noprefix('includedir', d)} \
--mandir ${@noprefix('mandir', d)} \
--infodir ${@noprefix('infodir', d)} \
--sysconfdir ${sysconfdir} \
--localstatedir ${localstatedir} \
--sharedstatedir ${sharedstatedir}"
MESON_C_ARGS = "${TARGET_CC_ARCH}${TOOLCHAIN_OPTIONS}"
MESON_LINK_ARGS = "${MESON_C_ARGS} ${LDFLAGS}"
MESON_HOST_ENDIAN = "${@bb.utils.contains('SITEINFO_ENDIANNESS', 'be', 'big', 'little', d)}"
MESON_TARGET_ENDIAN = "${@bb.utils.contains('TUNE_FEATURES', 'bigendian', 'big', 'little', d)}"
EXTRA_OEMESON += "${PACKAGECONFIG_CONFARGS}"
MESON_CROSS_FILE = ""
MESON_CROSS_FILE_class-target = "--cross-file ${WORKDIR}/meson.cross"
def meson_array(var, d):
return "', '".join(d.getVar(var, True).split()).join(("'", "'"))
addtask write_config before do_configure
do_write_config[vardeps] += "MESON_C_ARGS TOOLCHAIN_OPTIONS"
do_write_config() {
# This needs to be Py to split the args into single-element lists
cat >${WORKDIR}/meson.cross <<EOF
[binaries]
c = '${HOST_PREFIX}gcc'
cpp = '${HOST_PREFIX}g++'
ar = '${HOST_PREFIX}ar'
ld = '${HOST_PREFIX}ld'
strip = '${HOST_PREFIX}strip'
readelf = '${HOST_PREFIX}readelf'
pkgconfig = 'pkg-config'
[properties]
needs_exe_wrapper = true
c_args = [${@meson_array('MESON_C_ARGS', d)}]
c_link_args = [${@meson_array('MESON_LINK_ARGS', d)}]
cpp_args = [${@meson_array('MESON_C_ARGS', d)}]
cpp_link_args = [${@meson_array('MESON_LINK_ARGS', d)}]
[host_machine]
system = '${HOST_OS}'
cpu_family = '${HOST_ARCH}'
cpu = '${HOST_ARCH}'
endian = '${MESON_HOST_ENDIAN}'
[target_machine]
system = '${TARGET_OS}'
cpu_family = '${TARGET_ARCH}'
cpu = '${TARGET_ARCH}'
endian = '${MESON_TARGET_ENDIAN}'
EOF
}
CONFIGURE_FILES = "meson.build"
meson_do_configure() {
if ! meson ${MESONOPTS} "${MESON_SOURCEPATH}" "${B}" ${MESON_CROSS_FILE} ${EXTRA_OEMESON}; then
cat ${B}/meson-logs/meson-log.txt
bbfatal_log meson failed
fi
}
do_compile[progress] = "outof:^\[(\d+)/(\d+)\]\s+"
meson_do_compile() {
ninja ${PARALLEL_MAKE}
}
meson_do_install() {
DESTDIR='${D}' ninja ${PARALLEL_MAKEINST} install
}
EXPORT_FUNCTIONS do_configure do_compile do_install

2
meta-citadel/recipes-desktop/colord/colord_1.4.1.bb
View File

@ -59,5 +59,5 @@ do_configure_prepend() {
USERADD_PACKAGES = "${PN}"
USERADD_PARAM_${PN} = "--system --home /var/lib/colord --no-create-home --shell /bin/false --user-group colord"
inherit meson systemd useradd
inherit meson systemd useradd gettext

11
meta-citadel/recipes-desktop/geocode-glib/geocode-glib_3.25.4.1.bb
View File

@ -4,13 +4,14 @@ HOMEPAGE = "https://developer.gnome.org/geocode-glib/stable/"
LICENSE = "LGPLv2"
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605"
SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/geocode-glib/3.25/geocode-glib-${PV}.tar.xz"
SRC_URI[md5sum] = "7315e7ff162dfd01165ba8a284e3eda6"
SRC_URI[sha256sum] = "f10169262c313dfaa21acf00687c01e0aaf52983524648e8b9e8e42c052dd778"
GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase gettext
SRC_URI[archive.md5sum] = "7315e7ff162dfd01165ba8a284e3eda6"
SRC_URI[archive.sha256sum] = "f10169262c313dfaa21acf00687c01e0aaf52983524648e8b9e8e42c052dd778"
FILES_${PN} += "${datadir}/icons/gnome"
DEPENDS = "json-glib libsoup-2.4 glib-2.0 glib-2.0-native"
EXTRA_OEMESON = "-Denable-installed-tests=false -Denable-introspection=false -Denable-gtk-doc=false --buildtype=release"
EXTRA_OEMESON = "-Denable-installed-tests=false -Dintrospection=false -Denable-introspection=false -Denable-gtk-doc=false --buildtype=release"
inherit meson

30
meta-citadel/recipes-desktop/gnome-bluetooth/gnome-bluetooth_3.26.1.bb
View File

@ -4,36 +4,16 @@ LICENSE = "GPLv2 & LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343"
SRC_URI = "https://download.gnome.org/sources/gnome-bluetooth/3.26/gnome-bluetooth-${PV}.tar.xz"
SRC_URI[md5sum] = "200dff56da5a9ae2649aee38c0d7aac7"
SRC_URI[sha256sum] = "1d2c7b94fc76a833dad0d4d91344e9a5a7b4aad740c5a90944bd25c5be7e784f"
#SRC_URI = "https://download.gnome.org/sources/gnome-bluetooth/3.26/gnome-bluetooth-${PV}.tar.xz"
SRC_URI[archive.md5sum] = "200dff56da5a9ae2649aee38c0d7aac7"
SRC_URI[archive.sha256sum] = "1d2c7b94fc76a833dad0d4d91344e9a5a7b4aad740c5a90944bd25c5be7e784f"
DEPENDS = "glib-2.0 glib-2.0-native gtk+3 libcanberra libnotify libxml2-native gobject-introspection"
GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase gobject-introspection gettext
FILES_${PN} += "${datadir}/icons"
GIR_SCANNER_NATIVE = "${STAGING_BINDIR_NATIVE}/g-ir-scanner"
GIR_SCRIPT_PATH = "${B}/g-ir-scanner-script"
# https://github.com/ninja-build/ninja/issues/1002
write_gir_script () {
cat > ${GIR_SCRIPT_PATH} << EOF
#!/bin/sh
export PKG_CONFIG=pkg-config
export PKG_CONFIG_PATH=\"${PKG_CONFIG_PATH}\"
export XDG_DATA_DIRS=\"${STAGING_DATADIR}\"
export CC="x86_64-oe-linux-gcc --sysroot=${STAGING_DIR_HOST}"
export LD="x86_64-oe-linux-gcc --sysroot=${STAGING_DIR_HOST}"
${STAGING_BINDIR}/g-ir-scanner-wrapper \$@
EOF
chmod +x ${GIR_SCRIPT_PATH}
}
do_configure_append () {
write_gir_script
sed --in-place=.old "s;COMMAND = ${GIR_SCANNER_NATIVE};COMMAND = ${GIR_SCRIPT_PATH};" ${B}/build.ninja
}
EXTRA_OEMESON = "--buildtype=release -Denable-introspection=true"
inherit meson gobject-introspection

3
meta-citadel/recipes-desktop/gnome-shell/gnome-shell.inc
View File

@ -1,6 +1,8 @@
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
inherit meson gobject-introspection gettext
def gnome_verdir(v):
return oe.utils.trim_version(v, 2)
@ -52,4 +54,3 @@ do_install_append() {
}
EXTRA_OEMESON = "--buildtype=release -Denable-browser-plugin=false -Denable-man=false -Denable-systemd=yes -Denable-networkmanager=yes"
inherit meson gobject-introspection

9
meta-citadel/recipes-desktop/gnome-tweak-tool/gnome-tweak-tool_3.27.3.bb
View File

@ -3,9 +3,11 @@ HOMEPAGE = "https://wiki.gnome.org/action/show/Apps/Tweaks"
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://LICENSES/GPL-3.0;md5=9eef91148a9b14ec7f9df333daebc746"
SRC_URI = "https://download.gnome.org/sources/gnome-tweak-tool/3.27/gnome-tweak-tool-${PV}.tar.xz"
SRC_URI[md5sum] = "4fb5b7649a663d077acf8282cb2163da"
SRC_URI[sha256sum] = "43b77c256bf97e20d2c1c813736a2d9bc684d2c60c126f758e18566caa0f14fd"
GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase gettext
SRC_URI[archive.md5sum] = "4fb5b7649a663d077acf8282cb2163da"
SRC_URI[archive.sha256sum] = "43b77c256bf97e20d2c1c813736a2d9bc684d2c60c126f758e18566caa0f14fd"
DEPENDS = "glib-2.0 glib-2.0-native"
@ -16,5 +18,4 @@ FILES_${PN} += "\
${datadir}/icons/hicolor \
${datadir}/metainfo \
"
inherit meson

3
meta-citadel/recipes-desktop/gtk+/gtk+3_3.22.26.bb
View File

@ -1,3 +0,0 @@
require gtk.inc
SRC_URI[md5sum] = "eeeb8038fe0d386c7516fa46cd4fff6b"
SRC_URI[sha256sum] = "61eef0d320e541976e2dfe445729f12b5ade53050ee9de6184235cb60cd4b967"

17
meta-citadel/recipes-desktop/gtk+/gtk.inc
View File

@ -1,17 +0,0 @@
FILESEXTRAPATHS_prepend := "${COREBASE}/meta/recipes-gnome/gtk+/gtk+3:"
require ${COREBASE}/meta/recipes-gnome/gtk+/gtk+3.inc
MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \
file://0001-Hardcoded-libtool.patch \
file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \
file://0003-Add-disable-opengl-configure-option.patch \
file://0004-configure.ac-Fix-wayland-protocols-path.patch \
"
S = "${WORKDIR}/gtk+-${PV}"
LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \
file://gdk/gdk.h;endline=25;md5=c920ce39dc88c6f06d3e7c50e08086f2 \
file://tests/testgtk.c;endline=25;md5=cb732daee1d82af7a2bf953cf3cf26f1"

15
meta-citadel/recipes-desktop/nautilus/nautilus_3.26.0.bb
View File

@ -5,11 +5,15 @@ LICENSE = "GPLv3 & LGPLv2.1"
LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504 \
file://libnautilus-extension/LICENSE;md5=321bf41f280cf805086dd5a720b37785"
SRC_URI = "https://download.gnome.org/sources/nautilus/3.26/nautilus-${PV}.tar.xz \
file://0001-meson-find-libm-correctly.patch \
"
SRC_URI[md5sum] = "1b1d05e4d734e2e0710275849e83b85e"
SRC_URI[sha256sum] = "a02b30ef9033f6f92fbc5e29abaceeb58ce6a600ed9fa5a4697ba82901d07924"
GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase gobject-introspection gettext
#SRC_URI = "https://download.gnome.org/sources/nautilus/3.26/nautilus-${PV}.tar.xz
SRC_URI += "file://0001-meson-find-libm-correctly.patch"
SRC_URI[archive.md5sum] = "1b1d05e4d734e2e0710275849e83b85e"
SRC_URI[archive.sha256sum] = "a02b30ef9033f6f92fbc5e29abaceeb58ce6a600ed9fa5a4697ba82901d07924"
FILES_${PN} += "\
${datadir}/glib-2.0/schemas \
@ -18,7 +22,6 @@ FILES_${PN} += "\
${datadir}/icons/hicolor/ \
${datadir}/dbus-1/services \
"
inherit meson gobject-introspection
DEPENDS += "gtk+3 glib-2.0 pango gnome-autoar libxml2 gnome-desktop tracker"
# This probably belongs in meson.bbclass

0
meta-citadel/recipes-devtools/gcc/gcc-cross_7.2.bbappend → meta-citadel/recipes-devtools/gcc/gcc-cross_7.3.bbappend
View File

3
meta-citadel/recipes-devtools/meson/meson_%.bbappend Normal file
View File

@ -0,0 +1,3 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
SRC_URI += "file://0001-use-exe-wrapper-for-custom-targets.patch"

20
meta-citadel/recipes-devtools/meson/meson_0.40.1.bb
View File

@ -1,20 +0,0 @@
HOMEPAGE = "http://mesonbuild.com"
SUMMARY = "A high performance build system"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57"
SRC_URI = " \
git://github.com/mesonbuild/meson.git \
file://native_bindir.patch \
"
SRCREV = "b25d3e4d3f2b4d37029a507cc089bdde643c6240"
S = "${WORKDIR}/git"
inherit setuptools3
RDEPENDS_${PN} = "ninja python3-core python3-modules"
BBCLASSEXTEND = "native"

19
meta-citadel/recipes-devtools/meson/meson_0.44.0.bb
View File

@ -1,19 +0,0 @@
HOMEPAGE = "http://mesonbuild.com"
SUMMARY = "A high performance build system"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57"
SRC_URI = "git://github.com/mesonbuild/meson.git \
file://0001-use-exe-wrapper-for-custom-targets.patch \
"
SRCREV = "e674434389249d9b65e6403eb608e4c33d1d48cb"
S = "${WORKDIR}/git"
inherit setuptools3
RDEPENDS_${PN} = "ninja python3-core python3-modules"
BBCLASSEXTEND = "native"