qemu: Update glib to build on newer gcc

Update the glib version to 2.48.2 in order to fix build failure on newer
gcc[0].

Force internal version of libpcre for glib, since otherwise the build
failed, presumably since libpcre is not provided as a module (maybe it
should?).

Increasing the glib version further to the current latest was not
tested.

[0]
  CC       libglib_2_0_la-gdate.lo
../../glib-2.39.3/glib/gdate.c: In function 'g_date_strftime':
../../glib-2.39.3/glib/gdate.c:2497:7: error: format not a string literal, format string not checked [-Werror=format-nonliteral]
       tmplen = strftime (tmpbuf, tmpbufsize, locale_format, &tm);
       ^~~~~~
This commit is contained in:
Martin Erik Werner 2018-11-17 16:22:49 +01:00 committed by Joel Sherrill
parent 96cdedce58
commit f93fcef875
3 changed files with 6 additions and 5 deletions

View File

@ -8,11 +8,11 @@
%include %{_configdir}/base.cfg
%define glib_version_major 2.39
%define glib_version_minor 3
%define glib_version_major 2.48
%define glib_version_minor 2
%define glib_version %{glib_version_major}.%{glib_version_minor}
%hash sha256 glib-%{glib_version}.tar.xz d9fa6c9aa645a5e688a3bb29013bb83801b19ee767d99e33ff52e004e1cc5fc8
%hash sha256 glib-%{glib_version}.tar.xz f25e751589cb1a58826eac24fbd4186cda4518af772806b666a3f91f66e6d3f4
#
# The GLib build instructions. We use 2.x.x Release 1.

View File

@ -20,5 +20,5 @@ devel/libiconv-1.14-1
devel/gettext-0.18.3.1-1
devel/libffi-3.0.13-1
devel/pixman-0.32.4-1
devel/glib-2.39.3-1
devel/glib-2.48.2-1
devel/qemu-git-1

View File

@ -59,7 +59,8 @@ URL: https://developer.gnome.org/glib/
--datadir=%{_datadir} \
--build=%{_build} --host=%{_host} \
--with-sysroot=$SYSROOT \
--disable-dtrace
--disable-dtrace \
--with-pcre=internal
%{_ld_library_path}=$SYSROOT/lib \
%{__make} %{?_smp_mflags} all