[oe] [PATCH 7/7] nodejs: Add PACKAGECONFIG share to allow other projects to use node as library

Khem Raj raj.khem at gmail.com
Sun Dec 1 18:52:42 UTC 2019


On Sun, Dec 1, 2019 at 8:53 AM Andreas Müller <schnitzeltony at gmail.com> wrote:
>
> 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 <schnitzeltony at gmail.com>
> ---
>  ...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
>
> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0003-Install-both-binaries-and-use-libdir.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0003-Install-both-binaries-and-use-libdir.patch
> new file mode 100644
> index 000000000..7aa70fec9
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0003-Install-both-binaries-and-use-libdir.patch
> @@ -0,0 +1,96 @@
> +From 5bfeffdf4b5de1c60a2ff0d1ddf65db2bb9a1533 Mon Sep 17 00:00:00 2001
> +From: Elliott Sales de Andrade <quantum.analyst at gmail.com>
> +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 <quantum.analyst at gmail.com>
> +
> +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 <schnitzeltony at gmail.com>
> +
> +---
> + 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
> +
> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb
> index e36995c25..71a47636b 100644
> --- a/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb
> +++ b/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb
> @@ -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"

perhaps --shared,, would be better to express the negative part as empty

>  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} \

Using D in configure variables seems questionable, this could break
sstate reuse.

>                 ${ARCHFLAGS} \
>                 ${PACKAGECONFIG_CONFARGS}
>  }
> --
> 2.21.0
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel


More information about the Openembedded-devel mailing list