rpms/nodejs20
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable OpenSSL engine API support

Browse Source 
- Switch back to WASM bundling until the sitelib is sorted out
This commit is contained in:
Jan Staněk 2024-09-11 16:01:07 +02:00
parent a0d8469788
commit 2ca4e13443
No known key found for this signature in database
GPG Key ID: 2972F2037B243B6D
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nodejs20.spec
View File

@ -9,18 +9,12 @@
%global nodejs_default_sitelib %{_prefix}/lib/node_modules
%global nodejs_private_sitelib %{nodejs_default_sitelib}_%{nodejs_pkg_major}
# Break circular dependencies
%bcond bootstrap 0
# 2024-05-21: Temporarily re-enable bundling to work around issues in Rawhide
%if %{with bootstrap} || 0%{?nodejs_pkg_major} == 22
# 2024-09-11: Re-enable bundling until a wasm sitelib is sorted out
%bcond bundled_cjs_module_lexer 1
%bcond bundled_undici 1
%else
%bcond bundled_cjs_module_lexer 0
%bcond bundled_undici 0
%endif
%if 0%{?rhel} && 0%{?rhel} < 8
%bcond_without bundled_zlib
@ -35,6 +29,9 @@
# bytecompiling files in the node_modules/ directory
%global __python %{python3}
# Disable OpenSSL engine support
%bcond openssl_engine %[(0%{?fedora} && 0%{?fedora} < 41) || (0%{?rhel} && 0%{?rhel} < 10)]
# == Master Relase ==
# 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
@ -559,6 +556,7 @@ extra_cflags=(
-DZLIB_CONST
-O3
-fno-ipa-icf
%{!?with_openssl_engine:-DOPENSSL_NO_ENGINE}
)
export CFLAGS="%{optflags} ${extra_cflags[*]}" CXXFLAGS="%{optflags} ${extra_cflags[*]}"
export LDFLAGS="%{build_ldflags}"

12
packaging/nodejs.spec.j2
View File

@ -9,18 +9,12 @@
%global nodejs_default_sitelib %{_prefix}/lib/node_modules
%global nodejs_private_sitelib %{nodejs_default_sitelib}_%{nodejs_pkg_major}
# Break circular dependencies
%bcond bootstrap 0
# 2024-05-21: Temporarily re-enable bundling to work around issues in Rawhide
%if %{with bootstrap} || 0%{?nodejs_pkg_major} == 22
# 2024-09-11: Re-enable bundling until a wasm sitelib is sorted out
%bcond bundled_cjs_module_lexer 1
%bcond bundled_undici 1
%else
%bcond bundled_cjs_module_lexer 0
%bcond bundled_undici 0
%endif
%if 0%{?rhel} && 0%{?rhel} < 8
%bcond_without bundled_zlib
@ -35,6 +29,9 @@
# bytecompiling files in the node_modules/ directory
%global __python %{python3}
# Disable OpenSSL engine support
%bcond openssl_engine %[(0%{?fedora} && 0%{?fedora} < 41) || (0%{?rhel} && 0%{?rhel} < 10)]
# == Master Relase ==
# 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
@ -571,6 +568,7 @@ extra_cflags=(
-DZLIB_CONST
-O3
-fno-ipa-icf
%{!?with_openssl_engine:-DOPENSSL_NO_ENGINE}
)
export CFLAGS="%{optflags} ${extra_cflags[*]}" CXXFLAGS="%{optflags} ${extra_cflags[*]}"
export LDFLAGS="%{build_ldflags}"