Drop vestigial bundling bcond

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
This commit is contained in:
Stephen Gallagher 2023-03-01 13:08:45 -05:00
parent e389610bc2
commit 18ed5c68ec
No known key found for this signature in database
GPG Key ID: 45DB85A568286D11
2 changed files with 2 additions and 38 deletions

View File

@ -1,21 +1,3 @@
# The following macros control the usage of dependencies bundled from upstream.
#
# When to use what:
# - Regular (presumably non-modular) build: use neither (the default in Fedora)
# - Early bootstrapping build that is not intended to be shipped:
# use --with=bootstrap; this will bundle deps and add `~bootstrap` release suffix
# - Build with some dependencies not avalaible in necessary versions (i.e. module build):
# use --with=bundled; will bundle deps, but do not add the suffix
#
# create bootstrapping build with bundled deps and extra release suffix
%bcond_with bootstrap
# bundle dependencies that are not available in Fedora modules
%if %{with bootstrap}
%bcond_without bundled
%else
%bcond_with bundled
%endif
%if 0%{?rhel} && 0%{?rhel} < 8 %if 0%{?rhel} && 0%{?rhel} < 8
%bcond_without bundled_zlib %bcond_without bundled_zlib
%else %else
@ -528,7 +510,7 @@ export PATH="${cwd}/.bin:$PATH"
%{ssl_configure} \ %{ssl_configure} \
%{!?with_bundled_zlib:--shared-zlib} \ %{!?with_bundled_zlib:--shared-zlib} \
--shared-brotli \ --shared-brotli \
%{!?with_bundled:--shared-libuv} \ --shared-libuv \
--with-intl=small-icu \ --with-intl=small-icu \
--with-icu-default-data-dir=%{icudatadir} \ --with-icu-default-data-dir=%{icudatadir} \
--without-corepack \ --without-corepack \

View File

@ -1,21 +1,3 @@
# The following macros control the usage of dependencies bundled from upstream.
#
# When to use what:
# - Regular (presumably non-modular) build: use neither (the default in Fedora)
# - Early bootstrapping build that is not intended to be shipped:
# use --with=bootstrap; this will bundle deps and add `~bootstrap` release suffix
# - Build with some dependencies not avalaible in necessary versions (i.e. module build):
# use --with=bundled; will bundle deps, but do not add the suffix
#
# create bootstrapping build with bundled deps and extra release suffix
%bcond_with bootstrap
# bundle dependencies that are not available in Fedora modules
%if %{with bootstrap}
%bcond_without bundled
%else
%bcond_with bundled
%endif
%if 0%{?rhel} && 0%{?rhel} < 8 %if 0%{?rhel} && 0%{?rhel} < 8
%bcond_without bundled_zlib %bcond_without bundled_zlib
%else %else
@ -531,7 +513,7 @@ export PATH="${cwd}/.bin:$PATH"
%{ssl_configure} \ %{ssl_configure} \
%{!?with_bundled_zlib:--shared-zlib} \ %{!?with_bundled_zlib:--shared-zlib} \
--shared-brotli \ --shared-brotli \
%{!?with_bundled:--shared-libuv} \ --shared-libuv \
--with-intl=small-icu \ --with-intl=small-icu \
--with-icu-default-data-dir=%{icudatadir} \ --with-icu-default-data-dir=%{icudatadir} \
--without-corepack \ --without-corepack \