Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-27 05:13:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

fish.spec: depend on system pcre2 libraries on all platforms

Browse source 
These are now available on all supported platforms, and the download
process tends to break on build workers (where Internet access is
deliberately denied).
This commit is contained in:
David Adam 2022-07-10 10:43:13 +08:00
parent f7c411d5a5
commit c3c8cf1e01
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
fish.spec.in
View file

@ -9,12 +9,12 @@ Group: System/Shells
URL: https://fishshell.com/ URL: https://fishshell.com/
Source0: %{name}_@VERSION@.orig.tar.xz Source0: %{name}_@VERSION@.orig.tar.xz
BuildRequires: ncurses-devel gettext gcc-c++ xz BuildRequires: ncurses-devel gettext gcc-c++ xz pcre2-devel
%if 0%{?rhel} && 0%{?rhel} < 8 %if 0%{?rhel} && 0%{?rhel} < 8
BuildRequires: cmake3 BuildRequires: cmake3
%else %else
BuildRequires: cmake pcre2-devel BuildRequires: cmake
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
@ -53,9 +53,6 @@ is simple but incompatible with other shell languages.
%setup -q -n %{name}-@VERSION@ %setup -q -n %{name}-@VERSION@
%build %build
# CMake macros define -DBUILD_SHARED_LIBS:BOOL=ON, which breaks the
# bundled PCRE2 static library.
EXTRA_CMAKE_FLAGS="$EXTRA_CMAKE_FLAGS -DBUILD_SHARED_LIBS:BOOL=OFF"
# CMake macros define the wrong sysconfdir arguments # CMake macros define the wrong sysconfdir arguments
EXTRA_CMAKE_FLAGS="$EXTRA_CMAKE_FLAGS -DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir}" EXTRA_CMAKE_FLAGS="$EXTRA_CMAKE_FLAGS -DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir}"
%if 0%{?rhel} && 0%{?rhel} < 8 %if 0%{?rhel} && 0%{?rhel} < 8