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

Use bcond

Browse Source
This commit is contained in:
Zuzana Svetlikova 2017-10-06 09:36:28 +02:00
parent 219617d971
commit dd2b0067b8
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
nodejs.spec
View File

@ -1,7 +1,9 @@
%global with_debug 1 %global with_debug 1
# bundle dependencies that are not available as Fedora modules # bundle dependencies that are not available as Fedora modules
%{!?_with_bootstrap: %global bootstrap 1} # %%{!?_with_bootstrap: %%global bootstrap 1}
# use bcond for building modules
%bcond_with bootstrap
%{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}} %{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
@ -23,7 +25,7 @@
%global nodejs_patch 0 %global nodejs_patch 0
%global nodejs_abi %{nodejs_major}.%{nodejs_minor} %global nodejs_abi %{nodejs_major}.%{nodejs_minor}
%global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch} %global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch}
%global nodejs_release 1 %global nodejs_release 2
# == Bundled Dependency Versions == # == Bundled Dependency Versions ==
# v8 - from deps/v8/include/v8-version.h # v8 - from deps/v8/include/v8-version.h
@ -113,15 +115,16 @@ BuildRequires: zlib-devel
BuildRequires: gcc >= 4.9.4 BuildRequires: gcc >= 4.9.4
BuildRequires: gcc-c++ >= 4.9.4 BuildRequires: gcc-c++ >= 4.9.4
%if ! 0%{?bootstrap} #%if ! 0%%{?bootstrap}
%if %{with bootstrap}
Provides: bundled(http-parser) = %{http_parser_version}
Provides: bundled(libuv) = %{libuv_version}
%else
BuildRequires: systemtap-sdt-devel BuildRequires: systemtap-sdt-devel
BuildRequires: http-parser-devel >= 2.7.0 BuildRequires: http-parser-devel >= 2.7.0
Requires: http-parser >= 2.7.0 Requires: http-parser >= 2.7.0
BuildRequires: libuv-devel >= 1:1.9.1 BuildRequires: libuv-devel >= 1:1.9.1
Requires: libuv >= 1:1.9.1 Requires: libuv >= 1:1.9.1
%else
Provides: bundled(http-parser) = %{http_parser_version}
Provides: bundled(libuv) = %{libuv_version}
%endif %endif
BuildRequires: (openssl-devel <= 1:1.1.0 or compat-openssl10-devel) BuildRequires: (openssl-devel <= 1:1.1.0 or compat-openssl10-devel)
@ -197,7 +200,10 @@ Requires: openssl-devel%{?_isa}
Requires: zlib-devel%{?_isa} Requires: zlib-devel%{?_isa}
Requires: nodejs-packaging Requires: nodejs-packaging
%if ! 0%{?bootstrap} #%if ! 0%%{?bootstrap}
%if %{with bootstrap}
# deps are bundled
%else
Requires: http-parser-devel%{?_isa} Requires: http-parser-devel%{?_isa}
Requires: libuv-devel%{?_isa} Requires: libuv-devel%{?_isa}
%endif %endif
@ -270,13 +276,12 @@ export CXXFLAGS='%{optflags} -g \
export CFLAGS="$(echo ${CFLAGS} | tr '\n\\' ' ')" export CFLAGS="$(echo ${CFLAGS} | tr '\n\\' ' ')"
export CXXFLAGS="$(echo ${CXXFLAGS} | tr '\n\\' ' ')" export CXXFLAGS="$(echo ${CXXFLAGS} | tr '\n\\' ' ')"
%if ! 0%{?bootstrap} #%if ! 0%%{?bootstrap}
%if %{with bootstrap}
./configure --prefix=%{_prefix} \ ./configure --prefix=%{_prefix} \
--shared-openssl \ --shared-openssl \
--shared-zlib \ --shared-zlib \
--shared-libuv \ --without-dtrace \
--shared-http-parser \
--with-dtrace \
--with-intl=system-icu \ --with-intl=system-icu \
--debug-http2 \ --debug-http2 \
--debug-nghttp2 \ --debug-nghttp2 \
@ -285,7 +290,9 @@ export CXXFLAGS="$(echo ${CXXFLAGS} | tr '\n\\' ' ')"
./configure --prefix=%{_prefix} \ ./configure --prefix=%{_prefix} \
--shared-openssl \ --shared-openssl \
--shared-zlib \ --shared-zlib \
--without-dtrace \ --shared-libuv \
--shared-http-parser \
--with-dtrace \
--with-intl=system-icu \ --with-intl=system-icu \
--debug-http2 \ --debug-http2 \
--debug-nghttp2 \ --debug-nghttp2 \
@ -398,7 +405,10 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node -
%dir %{_datadir}/systemtap/tapset %dir %{_datadir}/systemtap/tapset
%{_datadir}/systemtap/tapset/node.stp %{_datadir}/systemtap/tapset/node.stp
%if ! 0%{?bootstrap} #%if ! 0%%{?bootstrap}
%if %{with bootstrap}
# no dtrace
%else
%dir %{_usr}/lib/dtrace %dir %{_usr}/lib/dtrace
%{_usr}/lib/dtrace/node.d %{_usr}/lib/dtrace/node.d
%endif %endif
@ -441,6 +451,9 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node -
%{_pkgdocdir}/npm/doc %{_pkgdocdir}/npm/doc
%changelog %changelog
* Fri Oct 06 2017 Zuzana Svetlikova <zsvetlik@redhat.com> - -
- Use bcond macro instead of bootstrap conditional
* Wed Sep 27 2017 Zuzana Svetlikova <zsvetlik@redhat.com> - - * Wed Sep 27 2017 Zuzana Svetlikova <zsvetlik@redhat.com> - -
- Fix nghttp2 version - Fix nghttp2 version
- Update to 8.6.0 - Update to 8.6.0