rpms/nodejs
7
0
Fork 0
Code Issues Pull Requests Releases Activity

unify configure.py calls into single command

Browse Source 
This should fix and prevent bugs resulting from only adding a configure
option to either bootstrap or non-bootstrap variant when the intention
was to add it to both.

Resolves: rhbz#2056971
Signed-off-by: Jan Staněk <jstanek@redhat.com>
This commit is contained in:
Jan Staněk 2022-04-04 14:48:57 +02:00 committed by Zuzana Svetlikova
parent fb63ea87bb
commit 415fcd5efe
1 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
nodejs.spec
View File

@ -379,45 +379,26 @@ export CXX='g++'
# build with debugging symbols and add defines from libuv (#892601) # build with debugging symbols and add defines from libuv (#892601)
# Node's v8 breaks with GCC 6 because of incorrect usage of methods on # Node's v8 breaks with GCC 6 because of incorrect usage of methods on
# NULL objects. We need to pass -fno-delete-null-pointer-checks # NULL objects. We need to pass -fno-delete-null-pointer-checks
export CFLAGS='%{optflags} \ extra_cflags=(
-D_LARGEFILE_SOURCE \ -D_LARGEFILE_SOURCE
-D_FILE_OFFSET_BITS=64 \ -D_FILE_OFFSET_BITS=64
-DZLIB_CONST \ -DZLIB_CONST
-fno-delete-null-pointer-checks' -fno-delete-null-pointer-checks
export CXXFLAGS='%{optflags} \ )
-D_LARGEFILE_SOURCE \ export CFLAGS="%{optflags} ${extra_cflags[*]}" CXXFLAGS="%{optflags} ${extra_cflags[*]}"
-D_FILE_OFFSET_BITS=64 \
-DZLIB_CONST \
-fno-delete-null-pointer-checks'
# Explicit new lines in C(XX)FLAGS can break naive build scripts
export CFLAGS="$(echo ${CFLAGS} | tr '\n\\' ' ')"
export CXXFLAGS="$(echo ${CXXFLAGS} | tr '\n\\' ' ')"
export LDFLAGS="%{build_ldflags}" export LDFLAGS="%{build_ldflags}"
%if %{with bootstrap}
%{__python3} configure.py --prefix=%{_prefix} \ %{__python3} configure.py --prefix=%{_prefix} \
--shared-openssl \ --shared-openssl \
--shared-zlib \ --shared-zlib \
--shared-brotli \ --shared-brotli \
--with-dtrace \ %{!?with_bootstrap:--shared-libuv} \
--with-intl=small-icu \ %{!?with_bootstrap:--shared-nghttp2} \
--openssl-use-def-ca-store \
--openssl-default-cipher-list=PROFILE=SYSTEM
%else
%{__python3} configure.py --prefix=%{_prefix} \
--shared-openssl \
--shared-zlib \
--shared-brotli \
--shared-libuv \
--shared-nghttp2 \
--with-dtrace \ --with-dtrace \
--with-intl=small-icu \ --with-intl=small-icu \
--with-icu-default-data-dir=%{icudatadir} \ --with-icu-default-data-dir=%{icudatadir} \
--openssl-use-def-ca-store \ --openssl-use-def-ca-store \
--openssl-default-cipher-list=PROFILE=SYSTEM --openssl-default-cipher-list=PROFILE=SYSTEM
%endif
%if %{?with_debug} == 1 %if %{?with_debug} == 1
# Setting BUILDTYPE=Debug builds both release and debug binaries # Setting BUILDTYPE=Debug builds both release and debug binaries
@ -697,6 +678,7 @@ end
%changelog %changelog
* Mon Apr 25 2022 Jan Staněk <jstanek@redhat.com> - 1:16.14.0-5 * Mon Apr 25 2022 Jan Staněk <jstanek@redhat.com> - 1:16.14.0-5
- Unify configure calls into single command
* Mon Apr 11 2022 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:16.14.0-4 * Mon Apr 11 2022 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:16.14.0-4
- Apply lock file validation fixes - Apply lock file validation fixes