libgnomekbd: cleanup DEPENDS inherit gsettings / remove unused config
PATCH 1/7 libgnomekbd: cleanup DEPENDS inherit gsettings / remove unused config
* DEPENDS: gconf and intltool-native are not required / gtk+3 pulls glib-2.0
* --disable-schemas-install is leftover from times gconf was used
--- meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.26.1.bb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.26.1.bb +2 -5
@@ -4,14 +4,11 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6e29c688d912da12b66b73e32b03d812" SECTION = "x11/gnome/libs" -DEPENDS = "gconf glib-2.0 libxklavier gtk+3 intltool-native" +DEPENDS = "gtk+3 libxklavier" -inherit features_check gnomebase gobject-introspection gettext +inherit features_check gnomebase gobject-introspection gsettings gettext REQUIRED_DISTRO_FEATURES = "x11" SRC_URI[archive.md5sum] = "98040022484406e7ebe25f82cef93344" SRC_URI[archive.sha256sum] = "f7ca02631576e9b88aee1b1bae37ac1488b80ee7975f20a97f29e761a7172679" - -EXTRA_OECONF_remove = "--disable-schemas-install" -
Signature · 1 line
2.21.0
PATCH 2/7 gnome-system-monitor: add gsettings to inherit
--- .../gnome-system-monitor/gnome-system-monitor_3.32.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.1.bb +1 -1
@@ -14,7 +14,7 @@ DEPENDS = " \ GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gnome-help itstool gtk-icon-cache features_check gettext upstream-version-is-even +inherit gnomebase gsettings gnome-help itstool gtk-icon-cache features_check gettext upstream-version-is-even REQUIRED_DISTRO_FEATURES = "x11 polkit"
Signature · 1 line
2.21.0
PATCH 3/7 tracker-miners: initial add 2.3.1
In reply to Andreas Müllertracker-miners is a mandatory runtime-dependency for nautilus
--- ...-warn-if-we-build-without-libseccomp.patch | 37 ++++++++++ .../tracker/tracker-miners_2.3.1.bb | 68 +++++++++++++++++++ 2 files changed, 105 insertions(+) create mode 100644 meta-gnome/recipes-gnome/tracker/tracker-miners/0001-meson.build-Just-warn-if-we-build-without-libseccomp.patch create mode 100644 meta-gnome/recipes-gnome/tracker/tracker-miners_2.3.1.bb
meta-gnome/recipes-gnome/tracker/tracker-miners/0001-meson.build-Just-warn-if-we-build-without-libseccomp.patch new file +37 -0
@@ -0,0 +1,37 @@ +From 54ea2cabf85ad1bd5695cdbd1935115c9495e80c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> +Date: Sun, 1 Dec 2019 17:06:59 +0100 +Subject: [PATCH] meson.build: Just warn if we build without libseccomp +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +libseccomp lives in meta-security currently and we cannot make it a mandatory +dependency. Once somebody moves libseccomp to meta-oe and adjusts all the +target specific knobs this patch can go. For discussion see [1]. + +[1] http://lists.openembedded.org/pipermail/openembedded-devel/2019-November/203234.html + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Andreas Müller <[email protected]> +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 71a9df4..1eaa1a0 100644 +--- a/meson.build ++++ b/meson.build +@@ -279,7 +279,7 @@ cpu_supports_seccomp = not unsupported_cpus.contains(host_cpu) + seccomp_required = system_supports_seccomp and cpu_supports_seccomp + + if not libseccomp.found() and seccomp_required +- error('Libseccomp is mandatory for sandboxed metadata extraction') ++ warning('Building without Libseccomp might cause security issues!') + endif + + #################################################################### +-- +2.21.0 +
meta-gnome/recipes-gnome/tracker/tracker-miners_2.3.1.bb new file +68 -0
68 lines not on this page · raw message
Signature · 1 line
2.21.0
PATCH 4/7 nautilus: add tracker-miners to RDPENDS
In reply to Andreas Müllernautilus does not start and complains:
| (org.gnome.Nautilus:863): GLib-GIO-ERROR **: 21:03:52.326: Settings schema 'org.freedesktop.Tracker.Miner.Files' is not installed
Thought I tested that successfully...
--- meta-gnome/recipes-gnome/nautilus/nautilus_3.34.1.bb | 4 ++++ 1 file changed, 4 insertions(+)
meta-gnome/recipes-gnome/nautilus/nautilus_3.34.1.bb +4 -0
@@ -30,3 +30,7 @@ FILES_${PN} += " \ ${datadir}/metainfo \ ${datadir}/gnome-shell \ " + +# mandatory - not checked during configuration: +# | (org.gnome.Nautilus:863): GLib-GIO-ERROR **: 21:03:52.326: Settings schema 'org.freedesktop.Tracker.Miner.Files' is not installed +RDEPENDS_${PN} += "tracker-miners"
Signature · 1 line
2.21.0
PATCH 5/7 xserver-xorg-cvt-native: initial add 1.20.5
In reply to Andreas Müllerupcoming mutter requires cvt to calculate source code tables of default video modes - wow
--- .../xserver-xorg-cvt-native_1.20.5.bb | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.5.bb
meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.5.bb new file +41 -0
@@ -0,0 +1,41 @@ +SUMMARY = "X.Org X cvt" +HOMEPAGE = "https://linux.die.net/man/1/cvt" +LICENSE = "MIT-X" +LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" + +DEPENDS += "pixman-native" + +XORG_PN = "xorg-server" + +SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" +SRC_URI[md5sum] = "c9fc7e21e11286dbedd22c00df652130" +SRC_URI[sha256sum] = "a81d8243f37e75a03d4f8c55f96d0bc25802be6ec45c3bfa5cb614c6d01bac9d" + +S = "${WORKDIR}/${XORG_PN}-${PV}" +B = "${WORKDIR}/build" + +inherit native pkgconfig + +do_configure[noexec] = "1" + +do_compile() { + cd ${S} + for header in `find -name '*.h'`; do + path=`dirname $header` + if ! echo "$incpaths" | grep -q "$path" ; then + incpaths="$incpaths -I$path" + fi + done + CFLAGS="${CFLAGS} -DXORG_VERSION_CURRENT=1 $incpaths `pkg-config --cflags pixman-1`" + LDFLAGS="${LDFLAGS} -lm `pkg-config --libs pixman-1`" + ${CC} $CFLAGS -o ${B}/cvt \ + ${S}/hw/xfree86/utils/cvt/cvt.c \ + ${S}/hw/xfree86/modes/xf86cvt.c \ + ${S}/os/xprintf.c \ + $LDFLAGS +} + +do_install() { + install -d ${D}${bindir} + install -m 755 ${B}/cvt ${D}${bindir} +}
Signature · 1 line
2.21.0
Re: [PATCH 5/7] xserver-xorg-cvt-native: initial add 1.20.5
fails on a host without x11 see
http://errors.yoctoproject.org/Errors/Details/289776/
Quoted 65 lines · Andreas Müller
upcoming mutter requires cvt to calculate source code tables of default video modes - wow
Signed-off-by Andreas Müller <[email protected]>--- .../xserver-xorg-cvt-native_1.20.5.bb | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.5.bbmeta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.5.bb new file +41
-1@@ -0,0 +1,41 @@ +SUMMARY = "X.Org X cvt" +HOMEPAGE = "https://linux.die.net/man/1/cvt" +LICENSE = "MIT-X" +LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" + +DEPENDS += "pixman-native" + +XORG_PN = "xorg-server" + +SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" +SRC_URI[md5sum] = "c9fc7e21e11286dbedd22c00df652130" +SRC_URI[sha256sum] = "a81d8243f37e75a03d4f8c55f96d0bc25802be6ec45c3bfa5cb614c6d01bac9d" + +S = "${WORKDIR}/${XORG_PN}-${PV}" +B = "${WORKDIR}/build" + +inherit native pkgconfig + +do_configure[noexec] = "1" + +do_compile() { + cd ${S} + for header in `find -name '*.h'`; do + path=`dirname $header` + if ! echo "$incpaths" | grep -q "$path" ; then + incpaths="$incpaths -I$path" + fi + done + CFLAGS="${CFLAGS} -DXORG_VERSION_CURRENT=1 $incpaths `pkg-config --cflags pixman-1`" + LDFLAGS="${LDFLAGS} -lm `pkg-config --libs pixman-1`" + ${CC} $CFLAGS -o ${B}/cvt \ + ${S}/hw/xfree86/utils/cvt/cvt.c \ + ${S}/hw/xfree86/modes/xf86cvt.c \ + ${S}/os/xprintf.c \ + $LDFLAGS +} + +do_install() { + install -d ${D}${bindir} + install -m 755 ${B}/cvt ${D}${bindir} +} --2.21.0
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
PATCH 6/7 mutter: initial add 3.34.1
In reply to Andreas Müller--- .../recipes-gnome/mutter/mutter_3.34.1.bb | 95 +++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 meta-gnome/recipes-gnome/mutter/mutter_3.34.1.bb
meta-gnome/recipes-gnome/mutter/mutter_3.34.1.bb new file +95 -0
@@ -0,0 +1,95 @@ +SUMMARY = "Window and compositing manager based on Clutter" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = " \ + xserver-xorg-cvt-native \ + virtual/libx11 \ + gtk+3 \ + gdk-pixbuf \ + cairo \ + pango \ + gsettings-desktop-schemas \ + json-glib \ + gnome-desktop3 \ + gnome-settings-daemon \ + libxtst \ + libxkbfile \ + xinerama \ +" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gsettings gobject-introspection gettext upstream-version-is-even features_check + +SRC_URI[archive.md5sum] = "4d7b67471fa4177e5ff0357e1f1736fb" +SRC_URI[archive.sha256sum] = "ba1826cf88bdb81e63943cac014a8e8bcf35ec178c53264401f9c72fdeab758e" + +# x11 is still manadatory - see meson.build +REQUIRED_DISTRO_FEATURES = "x11" + +# systemd can be replaced by libelogind (not available atow - make systemd +# mandatory distro feature) +LOGIND ?= "systemd" +REQUIRED_DISTRO_FEATURES += "systemd" + +# profiler requires sysprof 3.34 which is not willing to build atow +PACKAGECONFIG ??= " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl native-backend', '', d)} \ + remote-desktop \ + sm \ + startup-notification \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl wayland', 'wayland', '', d)} \ +" + +EXTRA_OEMESON += " \ + -Dxwayland_path=${bindir}/Xwayland \ +" + +# combi-config - see meson_options.txt for more details +PACKAGECONFIG[native-backend] = "-Dnative_backend=true -Dudev=true, -Dnative_backend=false -Dudev=false, libdrm virtual/libgbm libinput ${LOGIND} virtual/egl virtual/libgles2 udev" +PACKAGECONFIG[opengl] = "-Dopengl=true, -Dopengl=true, virtual/libgl" +PACKAGECONFIG[glx] = "-Dglx=true, -Dglx=false, glx" +PACKAGECONFIG[libwacom] = "-Dlibwacom=true, -Dlibwacom=false, libwacom" +PACKAGECONFIG[remote-desktop] = "-Dremote_desktop=true, -Dremote_desktop=false, pipewire" +PACKAGECONFIG[sm] = "-Dsm=true, -Dsm=false, libsm" +PACKAGECONFIG[profiler] = "-Dprofiler=true,-Dprofiler=false,sysprof" +PACKAGECONFIG[startup-notification] = "-Dstartup_notification=true, -Dstartup_notification=false, startup-notification, startup-notification" +PACKAGECONFIG[wayland] = "-Dwayland=true,-Dwayland=false,wayland wayland-native, xserver-xorg-xwayland" +PACKAGECONFIG[wayland-eglstream] = "-Dwayland_eglstream=true,-Dwayland_eglstream=false" + +# yes they changed from mutter-4 -> mutter-5 recently so be perpared +MUTTER_API_NAME = "mutter-5" + +do_install_append() { + # Add gir links in standard paths. That makes dependents life much easier + # to find them + install -d ${D}${datadir}/gir-1.0 + for gir_full in `find ${D}${libdir}/${MUTTER_API_NAME} -name '*.gir'`; do + gir=`basename "$gir_full"` + ln -sr "${D}${libdir}/${MUTTER_API_NAME}/$gir" "${D}${datadir}/gir-1.0/$gir" + done +} + +PACKAGES =+ "${PN}-tests" + +FILES_${PN} += " \ + ${datadir}/gnome-control-center \ + ${libdir}/${MUTTER_API_NAME}/lib*${SOLIBS} \ + ${libdir}/${MUTTER_API_NAME}/*.typelib \ + ${libdir}/${MUTTER_API_NAME}/plugins \ +" + +FILES_${PN}-tests += " \ + ${datadir}/installed-tests \ + ${datadir}/${MUTTER_API_NAME}/tests \ + ${libexecdir}/installed-tests/${MUTTER_API_NAME} \ +" + +FILES_${PN}-dev += " \ + ${libdir}/${MUTTER_API_NAME}/*.gir \ + ${libdir}/${MUTTER_API_NAME}/lib*.so \ +" + +RDEPENDS_${PN} += "zenity" +
Signature · 1 line
2.21.0
PATCH 7/7 nodejs: Add PACKAGECONFIG share to allow other projects to use node as library
In reply to Andreas MüllerThere are so many useful modules written for node.js I would like to use in C++/Qt projects.
Run-tested both variants by installing node-red with npm and running it.
--- ...Install-both-binaries-and-use-libdir.patch | 96 +++++++++++++++++++ .../recipes-devtools/nodejs/nodejs_10.17.0.bb | 5 +- 2 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0003-Install-both-binaries-and-use-libdir.patch
meta-oe/recipes-devtools/nodejs/nodejs/0003-Install-both-binaries-and-use-libdir.patch new file +96 -0
@@ -0,0 +1,96 @@ +From 5bfeffdf4b5de1c60a2ff0d1ddf65db2bb9a1533 Mon Sep 17 00:00:00 2001 +From: Elliott Sales de Andrade <[email protected]> +Date: Tue, 19 Mar 2019 23:22:40 -0400 +Subject: [PATCH 3/3] Install both binaries and use libdir. + +This allows us to build with a shared library for other users while +still providing the normal executable. + +Signed-off-by: Elliott Sales de Andrade <[email protected]> + +Stolen from [1] + +[1] https://src.fedoraproject.org/rpms/nodejs/raw/master/f/0003-Install-both-binaries-and-use-libdir.patch + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <[email protected]> + +--- + configure.py | 7 +++++++ + tools/install.py | 31 ++++++++++++++----------------- + 2 files changed, 21 insertions(+), 17 deletions(-) + +diff --git a/configure.py b/configure.py +index cfd4207..eb26f7d 100755 +--- a/configure.py ++++ b/configure.py +@@ -552,6 +552,12 @@ parser.add_option('--shared', + help='compile shared library for embedding node in another project. ' + + '(This mode is not officially supported for regular applications)') + ++parser.add_option('--libdir', ++ action='store', ++ dest='libdir', ++ default='lib', ++ help='a directory to install the shared library into') ++ + parser.add_option('--without-v8-platform', + action='store_true', + dest='without_v8_platform', +@@ -1095,6 +1101,7 @@ def configure_node(o): + if options.code_cache_path: + o['variables']['node_code_cache_path'] = options.code_cache_path + o['variables']['node_shared'] = b(options.shared) ++ o['variables']['libdir'] = options.libdir + node_module_version = getmoduleversion.get_version() + + if sys.platform == 'darwin': +diff --git a/tools/install.py b/tools/install.py +index 028c32e..bf443c4 100755 +--- a/tools/install.py ++++ b/tools/install.py +@@ -117,26 +117,23 @@ def subdir_files(path, dest, action): + + def files(action): + is_windows = sys.platform == 'win32' +- output_file = 'node' + output_prefix = 'out/Release/' ++ output_libprefix = output_prefix + +- if 'false' == variables.get('node_shared'): +- if is_windows: +- output_file += '.exe' ++ if is_windows: ++ output_bin = 'node.exe' ++ output_lib = 'node.dll' + else: +- if is_windows: +- output_file += '.dll' +- else: +- output_file = 'lib' + output_file + '.' + variables.get('shlib_suffix') +- # GYP will output to lib.target except on OS X, this is hardcoded +- # in its source - see the _InstallableTargetInstallPath function. +- if sys.platform != 'darwin': +- output_prefix += 'lib.target/' +- +- if 'false' == variables.get('node_shared'): +- action([output_prefix + output_file], 'bin/' + output_file) +- else: +- action([output_prefix + output_file], 'lib/' + output_file) ++ output_bin = 'node' ++ output_lib = 'libnode.' + variables.get('shlib_suffix') ++ # GYP will output to lib.target except on OS X, this is hardcoded ++ # in its source - see the _InstallableTargetInstallPath function. ++ if sys.platform != 'darwin': ++ output_libprefix += 'lib.target/' ++ ++ action([output_prefix + output_bin], 'bin/' + output_bin) ++ if 'true' == variables.get('node_shared'): ++ action([output_libprefix + output_lib], variables.get('libdir') + '/' + output_lib) + + if 'true' == variables.get('node_use_dtrace'): + action(['out/Release/node.d'], 'lib/dtrace/node.d') +-- +2.23.0 +
meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb +4 -1
@@ -17,12 +17,13 @@ COMPATIBLE_HOST_riscv32 = "null" SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ file://0001-Disable-running-gyp-files-for-bundled-deps.patch \ + file://0003-Install-both-binaries-and-use-libdir.patch \ file://0004-Make-compatibility-with-gcc-4.8.patch \ file://0007-v8-don-t-override-ARM-CFLAGS.patch \ " SRC_URI_append_class-target = " \ - file://0005-Link-atomic-library.patch \ file://0002-Using-native-torque.patch \ + file://0005-Link-atomic-library.patch \ " SRC_URI[md5sum] = "d5a56d0abf764a91f627f0690cd4b9f3"
@@ -57,6 +58,7 @@ PACKAGECONFIG[gyp] = ",,gyp-py2-native" PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu" PACKAGECONFIG[libuv] = "--shared-libuv,,libuv" PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2" +PACKAGECONFIG[shared] = "--shared" PACKAGECONFIG[zlib] = "--shared-zlib,,zlib" # We don't want to cross-compile during target compile,
@@ -99,6 +101,7 @@ do_configure () { ./configure --prefix=${prefix} --without-snapshot --shared-openssl \ --dest-cpu="${@map_nodejs_arch(d.getVar('TARGET_ARCH'), d)}" \ --dest-os=linux \ + --libdir=${D}${libdir} \ ${ARCHFLAGS} \ ${PACKAGECONFIG_CONFARGS} }
Signature · 1 line
2.21.0
Re: [PATCH 7/7] nodejs: Add PACKAGECONFIG share to allow other projects to use node as library
Quoted 135 lines · Andreas Müller
There are so many useful modules written for node.js I would like to use in C++/Qt projects.
Run-tested both variants by installing node-red with npm and running it.
Signed-off-by Andreas Müller <[email protected]>--- ...Install-both-binaries-and-use-libdir.patch | 96 +++++++++++++++++++ .../recipes-devtools/nodejs/nodejs_10.17.0.bb | 5 +- 2 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0003-Install-both-binaries-and-use-libdir.patchmeta-oe/recipes-devtools/nodejs/nodejs/0003-Install-both-binaries-and-use-libdir.patch new file +96
-0@@ -0,0 +1,96 @@ +From 5bfeffdf4b5de1c60a2ff0d1ddf65db2bb9a1533 Mon Sep 17 00:00:00 2001 +From: Elliott Sales de Andrade <[email protected]> +Date: Tue, 19 Mar 2019 23:22:40 -0400 +Subject: [PATCH 3/3] Install both binaries and use libdir. + +This allows us to build with a shared library for other users while +still providing the normal executable. + +Signed-off-by: Elliott Sales de Andrade <[email protected]> + +Stolen from [1] + +[1] https://src.fedoraproject.org/rpms/nodejs/raw/master/f/0003-Install-both-binaries-and-use-libdir.patch + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <[email protected]> + +--- + configure.py | 7 +++++++ + tools/install.py | 31 ++++++++++++++----------------- + 2 files changed, 21 insertions(+), 17 deletions(-) + +diff --git a/configure.py b/configure.py +index cfd4207..eb26f7d 100755 +--- a/configure.py ++++ b/configure.py +@@ -552,6 +552,12 @@ parser.add_option('--shared', + help='compile shared library for embedding node in another project. ' + + '(This mode is not officially supported for regular applications)') + ++parser.add_option('--libdir', ++ action='store', ++ dest='libdir', ++ default='lib', ++ help='a directory to install the shared library into') ++ + parser.add_option('--without-v8-platform', + action='store_true', + dest='without_v8_platform', +@@ -1095,6 +1101,7 @@ def configure_node(o): + if options.code_cache_path: + o['variables']['node_code_cache_path'] = options.code_cache_path + o['variables']['node_shared'] = b(options.shared) ++ o['variables']['libdir'] = options.libdir + node_module_version = getmoduleversion.get_version() + + if sys.platform == 'darwin': +diff --git a/tools/install.py b/tools/install.py +index 028c32e..bf443c4 100755 +--- a/tools/install.py ++++ b/tools/install.py +@@ -117,26 +117,23 @@ def subdir_files(path, dest, action): + + def files(action): + is_windows = sys.platform == 'win32' +- output_file = 'node' + output_prefix = 'out/Release/' ++ output_libprefix = output_prefix + +- if 'false' == variables.get('node_shared'): +- if is_windows: +- output_file += '.exe' ++ if is_windows: ++ output_bin = 'node.exe' ++ output_lib = 'node.dll' + else: +- if is_windows: +- output_file += '.dll' +- else: +- output_file = 'lib' + output_file + '.' + variables.get('shlib_suffix') +- # GYP will output to lib.target except on OS X, this is hardcoded +- # in its source - see the _InstallableTargetInstallPath function. +- if sys.platform != 'darwin': +- output_prefix += 'lib.target/' +- +- if 'false' == variables.get('node_shared'): +- action([output_prefix + output_file], 'bin/' + output_file) +- else: +- action([output_prefix + output_file], 'lib/' + output_file) ++ output_bin = 'node' ++ output_lib = 'libnode.' + variables.get('shlib_suffix') ++ # GYP will output to lib.target except on OS X, this is hardcoded ++ # in its source - see the _InstallableTargetInstallPath function. ++ if sys.platform != 'darwin': ++ output_libprefix += 'lib.target/' ++ ++ action([output_prefix + output_bin], 'bin/' + output_bin) ++ if 'true' == variables.get('node_shared'): ++ action([output_libprefix + output_lib], variables.get('libdir') + '/' + output_lib) + + if 'true' == variables.get('node_use_dtrace'): + action(['out/Release/node.d'], 'lib/dtrace/node.d') +-- +2.23.0 +meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb +2
-1@@ -17,12 +17,13 @@ COMPATIBLE_HOST_riscv32 = "null" SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ file://0001-Disable-running-gyp-files-for-bundled-deps.patch \ + file://0003-Install-both-binaries-and-use-libdir.patch \ file://0004-Make-compatibility-with-gcc-4.8.patch \ file://0007-v8-don-t-override-ARM-CFLAGS.patch \ " SRC_URI_append_class-target = " \ - file://0005-Link-atomic-library.patch \ file://0002-Using-native-torque.patch \ + file://0005-Link-atomic-library.patch \ " SRC_URI[md5sum] = "d5a56d0abf764a91f627f0690cd4b9f3"
meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb PACKAGECONFIG[gyp] = ",,gyp-py2-native" · line 61
Quoted 4 lines
meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb +1
-0@@ -57,6 +58,7 @@ PACKAGECONFIG[gyp] = ",,gyp-py2-native" PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu" PACKAGECONFIG[libuv] = "--shared-libuv,,libuv" PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2" +PACKAGECONFIG[shared] = "--shared"
perhaps --shared,, would be better to express the negative part as empty
meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb do_configure () { · line 104
Quoted 8 lines
meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb +1
-0PACKAGECONFIG[zlib] = "--shared-zlib,,zlib" # We don't want to cross-compile during target compile,@@ -99,6 +101,7 @@ do_configure () { ./configure --prefix=${prefix} --without-snapshot --shared-openssl \ --dest-cpu="${@map_nodejs_arch(d.getVar('TARGET_ARCH'), d)}" \ --dest-os=linux \ + --libdir=${D}${libdir} \
Using D in configure variables seems questionable, this could break sstate reuse.
Quoted 11 lines
meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb +0
-1${ARCHFLAGS} \ ${PACKAGECONFIG_CONFARGS} } --2.21.0
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.26.1.bb LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6e29c688d912da12b66b73e32b03d812" · line 7
Quoted 5 lines · Andreas Müller
* DEPENDS: ... gtk+3 pulls glib-2.0
...meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.26.1.bb +1
-1-DEPENDS = "gconf glib-2.0 libxklavier gtk+3 intltool-native" +DEPENDS = "gtk+3 libxklavier"
It is better to have explicit dependencies on everything used directly by the recipe.
gtk+3 -> glib-2.0 is not a dependency that is likely to go away in the future, but in general relying on indirect dependencies tends to break frequently.
cu
Adrian
Quoted 11 lines · Adrian Bunk
meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.26.1.bb LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6e29c688d912da12b66b73e32b03d812" · line 7
Quoted 5 lines · Andreas Müller
* DEPENDS: ... gtk+3 pulls glib-2.0
...meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.26.1.bb +1
-1-DEPENDS = "gconf glib-2.0 libxklavier gtk+3 intltool-native" +DEPENDS = "gtk+3 libxklavier"It is better to have explicit dependencies on everything used directly by the recipe.
I would tend to agree. Since it's hard to track that once say gtk+3 drops it for a different reason, this recipe will break
Quoted 11 lines
gtk+3 -> glib-2.0 is not a dependency that is likely to go away in the future, but in general relying on indirect dependencies tends to break frequently.
cu
Adrian
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel