Ticket #3611: 0001-qemu-Update-glib-to-build-on-newer-gcc.patch

File 0001-qemu-Update-glib-to-build-on-newer-gcc.patch, 2.8 KB (added by Martin Erik Werner, on 11/17/18 at 16:25:13)
  • .cfg

    From 22acc86dc80feadfe5e43698ccbdcfd062a7a1ed Mon Sep 17 00:00:00 2001
    From: Martin Erik Werner <martinerikwerner@gmail.com>
    Date: Sat, 17 Nov 2018 16:22:49 +0100
    Subject: [PATCH] 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);
           ^~~~~~
    ---
     bare/config/devel/{glib-2.39.3-1.cfg => glib-2.48.2-1.cfg} | 6 +++---
     bare/config/devel/qemu.bset                                | 2 +-
     source-builder/config/glib-2-1.cfg                         | 3 ++-
     3 files changed, 6 insertions(+), 5 deletions(-)
     rename bare/config/devel/{glib-2.39.3-1.cfg => glib-2.48.2-1.cfg} (64%)
    
    diff --git a/bare/config/devel/glib-2.39.3-1.cfg b/bare/config/devel/glib-2.48.2-1.cfg
    similarity index 64%
    rename from bare/config/devel/glib-2.39.3-1.cfg
    rename to bare/config/devel/glib-2.48.2-1.cfg
    index d86fe28..6454346 100644
    old new  
    88
    99%include %{_configdir}/base.cfg
    1010
    11 %define glib_version_major 2.39
    12 %define glib_version_minor 3
     11%define glib_version_major 2.48
     12%define glib_version_minor 2
    1313%define glib_version       %{glib_version_major}.%{glib_version_minor}
    1414
    15 %hash sha256 glib-%{glib_version}.tar.xz d9fa6c9aa645a5e688a3bb29013bb83801b19ee767d99e33ff52e004e1cc5fc8
     15%hash sha256 glib-%{glib_version}.tar.xz f25e751589cb1a58826eac24fbd4186cda4518af772806b666a3f91f66e6d3f4
    1616
    1717#
    1818# The GLib build instructions. We use 2.x.x Release 1.
  • bare/config/devel/qemu.bset

    diff --git a/bare/config/devel/qemu.bset b/bare/config/devel/qemu.bset
    index db147fe..543518d 100644
    a b devel/libiconv-1.14-1 
    2020devel/gettext-0.18.3.1-1
    2121devel/libffi-3.0.13-1
    2222devel/pixman-0.32.4-1
    23 devel/glib-2.39.3-1
     23devel/glib-2.48.2-1
    2424devel/qemu-git-1
  • source-builder/config/glib-2-1.cfg

    diff --git a/source-builder/config/glib-2-1.cfg b/source-builder/config/glib-2-1.cfg
    index 16a51fe..09b43fa 100644
    a b URL: https://developer.gnome.org/glib/ 
    5959    --datadir=%{_datadir} \
    6060    --build=%{_build} --host=%{_host} \
    6161    --with-sysroot=$SYSROOT \
    62     --disable-dtrace
     62    --disable-dtrace \
     63    --with-pcre=internal
    6364
    6465  %{_ld_library_path}=$SYSROOT/lib \
    6566  %{__make} %{?_smp_mflags} all