freebsd: Fix GDB building on some 12 and higher versions

This commit is contained in:
Chris Johns 2020-01-21 14:46:16 +11:00
parent d48abf49ab
commit 599c4d7c87
2 changed files with 13 additions and 1 deletions

View File

@ -191,6 +191,15 @@ URL: http://www.gnu.org/software/gdb/
%endif
%endif
#
# Fix the mess iconv is on FreeBSD 10.0 and higher.
#
%if %{defined iconv_prefix}
%define iconv_opts --with-libiconv-prefix=%{iconv_prefix}
%else
%define iconv_opts %{nil}
%endif
#
#
# Prepare the source code.
@ -239,6 +248,7 @@ URL: http://www.gnu.org/software/gdb/
--without-zlib \
--with-expat \
--with-guile=no \
%{iconv_opts} \
%{!?without_python:%{with_python_option}} \
--prefix=%{_prefix} --bindir=%{_bindir} \
--exec-prefix=%{_exec_prefix} \

View File

@ -111,9 +111,11 @@ def load():
if check.check_exe(cvs, cvs):
defines['__cvs'] = cvs
#
# Fix the mess iconv is on FreeBSD 10.0.
# Fix the mess iconv is on FreeBSD 10.0 and higher.
#
defines['iconv_includes'] = ('none', 'none', '%{host_includes} %{host_ldflags}')
if fb_version >= 12:
defines['iconv_prefix'] = ('none', 'none', '%{_usr}')
#
# On 11.0+ makeinfo and install-info have moved to /usr/local/...