fix import
This commit is contained in:
parent
9b7039aaf7
commit
3c9cac3fe9
@ -1,72 +0,0 @@
|
|||||||
From e2ff0fc92ddbaa5535d684e353c55cefe99eb081 Mon Sep 17 00:00:00 2001
|
|
||||||
From: rpm-build <rpm-build>
|
|
||||||
Date: Tue, 27 Sep 2022 13:48:12 +0200
|
|
||||||
Subject: [PATCH] Install both binaries and use libdir
|
|
||||||
|
|
||||||
Signed-off-by: rpm-build <rpm-build>
|
|
||||||
---
|
|
||||||
configure.py | 7 +++++++
|
|
||||||
tools/install.py | 8 +++++---
|
|
||||||
2 files changed, 12 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/configure.py b/configure.py
|
|
||||||
index 1a7023d..b16db0c 100755
|
|
||||||
--- a/configure.py
|
|
||||||
+++ b/configure.py
|
|
||||||
@@ -739,6 +739,12 @@ parser.add_argument('--shared',
|
|
||||||
help='compile shared library for embedding node in another project. ' +
|
|
||||||
'(This mode is not officially supported for regular applications)')
|
|
||||||
|
|
||||||
+parser.add_argument('--libdir',
|
|
||||||
+ action='store',
|
|
||||||
+ dest='libdir',
|
|
||||||
+ default='lib',
|
|
||||||
+ help='a directory to install the shared library into')
|
|
||||||
+
|
|
||||||
parser.add_argument('--without-v8-platform',
|
|
||||||
action='store_true',
|
|
||||||
dest='without_v8_platform',
|
|
||||||
@@ -1368,6 +1374,7 @@ def configure_node(o):
|
|
||||||
o['variables']['node_no_browser_globals'] = b(options.no_browser_globals)
|
|
||||||
|
|
||||||
o['variables']['node_shared'] = b(options.shared)
|
|
||||||
+ o['variables']['libdir'] = options.libdir
|
|
||||||
node_module_version = getmoduleversion.get_version()
|
|
||||||
|
|
||||||
if options.dest_os == 'android':
|
|
||||||
diff --git a/tools/install.py b/tools/install.py
|
|
||||||
index a6d1f8b..e3ef9d7 100755
|
|
||||||
--- a/tools/install.py
|
|
||||||
+++ b/tools/install.py
|
|
||||||
@@ -144,6 +144,7 @@ def files(action):
|
|
||||||
is_windows = sys.platform == 'win32'
|
|
||||||
output_file = 'node'
|
|
||||||
output_prefix = 'out/Release/'
|
|
||||||
+ output_libprefix = output_prefix
|
|
||||||
|
|
||||||
if is_windows:
|
|
||||||
output_file += '.exe'
|
|
||||||
@@ -151,8 +152,8 @@ def files(action):
|
|
||||||
|
|
||||||
if 'true' == variables.get('node_shared'):
|
|
||||||
if is_windows:
|
|
||||||
- action([output_prefix + 'libnode.dll'], 'bin/libnode.dll')
|
|
||||||
- action([output_prefix + 'libnode.lib'], 'lib/libnode.lib')
|
|
||||||
+ action([output_libprefix + 'libnode.dll'], 'bin/libnode.dll')
|
|
||||||
+ action([output_libprefix + 'libnode.lib'], 'lib/libnode.lib')
|
|
||||||
elif sys.platform == 'zos':
|
|
||||||
# GYP will output to lib.target; see _InstallableTargetInstallPath
|
|
||||||
# function in tools/gyp/pylib/gyp/generator/make.py
|
|
||||||
@@ -176,7 +177,8 @@ def files(action):
|
|
||||||
try_symlink(so_name, link_path)
|
|
||||||
else:
|
|
||||||
output_lib = 'libnode.' + variables.get('shlib_suffix')
|
|
||||||
- action([output_prefix + output_lib], 'lib/' + output_lib)
|
|
||||||
+ 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.37.3
|
|
||||||
|
|
@ -1,31 +0,0 @@
|
|||||||
From 9872b897d6a9a39e3392c39bca70cfd9dd084558 Mon Sep 17 00:00:00 2001
|
|
||||||
From: rpm-build <rpm-build>
|
|
||||||
Date: Mon, 26 Sep 2022 16:02:39 +0200
|
|
||||||
Subject: [PATCH] install: keep installing dtrace and systemtap files
|
|
||||||
|
|
||||||
Partly reverts commit e27e709d3ca93b3e7036ddc4f4d28dfde228bfb6.
|
|
||||||
|
|
||||||
Signed-off-by: rpm-build <rpm-build>
|
|
||||||
---
|
|
||||||
tools/install.py | 5 +++++
|
|
||||||
1 file changed, 5 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/tools/install.py b/tools/install.py
|
|
||||||
index 4b01d67..dc16797 100755
|
|
||||||
--- a/tools/install.py
|
|
||||||
+++ b/tools/install.py
|
|
||||||
@@ -178,6 +178,11 @@ def files(action):
|
|
||||||
output_lib = 'libnode.' + variables.get('shlib_suffix')
|
|
||||||
action([output_prefix + output_lib], variables.get('libdir') + '/' + output_lib)
|
|
||||||
|
|
||||||
+ if 'true' == variables.get('node_use_dtrace'):
|
|
||||||
+ action(['out/Release/node.d'], variables.get('libdir') + '/dtrace/node.d')
|
|
||||||
+
|
|
||||||
+ action(['src/node.stp'], 'share/systemtap/tapset/')
|
|
||||||
+
|
|
||||||
action(['deps/v8/tools/gdbinit'], 'share/doc/node/')
|
|
||||||
action(['deps/v8/tools/lldb_commands.py'], 'share/doc/node/')
|
|
||||||
|
|
||||||
--
|
|
||||||
2.37.3
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
|||||||
--- !Policy
|
|
||||||
product_versions:
|
|
||||||
- rhel-9
|
|
||||||
decision_context: osci_compose_gate
|
|
||||||
rules:
|
|
||||||
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
|
|
@ -30,7 +30,7 @@
|
|||||||
# This is used by both the nodejs package and the npm subpackage that
|
# This is used by both the nodejs package and the npm subpackage that
|
||||||
# has a separate version - the name is special so that rpmdev-bumpspec
|
# has a separate version - the name is special so that rpmdev-bumpspec
|
||||||
# will bump this rather than adding .1 to the end.
|
# will bump this rather than adding .1 to the end.
|
||||||
%global baserelease 1
|
%global baserelease 2
|
||||||
|
|
||||||
%{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
|
%{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
|
||||||
|
|
||||||
@ -696,6 +696,10 @@ end
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Apr 18 2023 Jan Staněk <jstanek@redhat.com> - 1:14.21.3-2
|
||||||
|
- Record CVEs fixed by the current release
|
||||||
|
Resolves: CVE-2022-0235 CVE-2022-3517
|
||||||
|
|
||||||
* Mon Mar 06 2023 Jan Staněk <jstanek@redhat.com> - 1:14.21.3-1
|
* Mon Mar 06 2023 Jan Staněk <jstanek@redhat.com> - 1:14.21.3-1
|
||||||
- Rebase to 14.21.3
|
- Rebase to 14.21.3
|
||||||
Resolves: rhbz#2153712
|
Resolves: rhbz#2153712
|
||||||
@ -710,7 +714,7 @@ end
|
|||||||
|
|
||||||
* Wed Nov 16 2022 Jan Staněk <jstanek@redhat.com> - 1:14.21.1-1
|
* Wed Nov 16 2022 Jan Staněk <jstanek@redhat.com> - 1:14.21.1-1
|
||||||
- Rebase to version 14.21.1
|
- Rebase to version 14.21.1
|
||||||
Resolves: rhbz#2129805 CVE-2022-43548 CVE-2022-3517
|
Resolves: rhbz#2129805 CVE-2022-43548
|
||||||
|
|
||||||
* Fri Oct 07 2022 Jan Staněk <jstanek@redhat.com> - 1:14.20.1-2
|
* Fri Oct 07 2022 Jan Staněk <jstanek@redhat.com> - 1:14.20.1-2
|
||||||
- Record issues fixed in the current version
|
- Record issues fixed in the current version
|
||||||
|
@ -1,2 +0,0 @@
|
|||||||
[koji]
|
|
||||||
targets = master f34 f33
|
|
Loading…
Reference in New Issue
Block a user