rpms/bind
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Disable GEOIP and compile on s390x without SDB

Browse Source
This commit is contained in:
Petr Menšík 2020-03-27 13:25:10 +01:00
parent 80d0367669
commit 15cfc8b402
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bind.spec
View File

@ -25,12 +25,6 @@
%bcond_with BDB
# skip DLZ for now
%bcond_with DLZ
# Legacy GeoIP support
%bcond_with GEOIP
# New MaxMind GeoLite support
%bcond_without GEOIP2
# Legacy GeoIP support
%bcond_with GEOIP
# New MaxMind GeoLite support
%bcond_without GEOIP2
%if 0%{?fedora} >= 28
@ -212,9 +206,6 @@ BuildRequires: lmdb-devel
%if %{with JSON}
BuildRequires: json-c-devel
%endif
%if %{with GEOIP}
BuildRequires: GeoIP-devel
%endif
%if %{with GEOIP2}
BuildRequires: libmaxminddb-devel
%endif
@ -383,9 +374,6 @@ Requires: json-c-devel%{?_isa}
%if %{with DNSTAP}
Requires: fstrm-devel%{?_isa} protobuf-c-devel%{?_isa}
%endif
%if %{with GEOIP}
Requires: GeoIP-devel%{?_isa}
%endif
%if %{with GEOIP2}
Requires: libmaxminddb-devel%{?_isa}
%endif
@ -545,9 +533,14 @@ cp -fp contrib/sdb/sqlite/zone2sqlite.c bin/sdb_tools
# Sparc and s390 arches need to use -fPIE
%ifarch sparcv9 sparc64 s390 s390x
for i in bin/named{,-sdb}/{,unix}/Makefile.in; do
for i in bin/named/{,unix}/Makefile.in; do
sed -i 's|fpie|fPIE|g' $i
done
%if %{with SDB}
for i in bin/named-sdb/{,unix}/Makefile.in; do
sed -i 's|fpie|fPIE|g' $i
done
%endif
%endif
:;
@ -602,9 +595,6 @@ export LIBDIR_SUFFIX
--includedir=%{_includedir}/bind9 \
--with-tuning=large \
--with-libidn2 \
%if %{with GEOIP}
--with-geoip \
%endif
%if %{with GEOIP2}
--with-maxminddb \
%endif