summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bare/config/devel/glib-2.48.2-1.cfg (renamed from bare/config/devel/glib-2.39.3-1.cfg)6
-rw-r--r--bare/config/devel/qemu.bset2
-rw-r--r--source-builder/config/glib-2-1.cfg3
3 files changed, 6 insertions, 5 deletions
diff --git a/bare/config/devel/glib-2.39.3-1.cfg b/bare/config/devel/glib-2.48.2-1.cfg
index d86fe28..6454346 100644
--- a/bare/config/devel/glib-2.39.3-1.cfg
+++ b/bare/config/devel/glib-2.48.2-1.cfg
@@ -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.
diff --git a/bare/config/devel/qemu.bset b/bare/config/devel/qemu.bset
index db147fe..543518d 100644
--- a/bare/config/devel/qemu.bset
+++ b/bare/config/devel/qemu.bset
@@ -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
diff --git a/source-builder/config/glib-2-1.cfg b/source-builder/config/glib-2-1.cfg
index 16a51fe..09b43fa 100644
--- a/source-builder/config/glib-2-1.cfg
+++ b/source-builder/config/glib-2-1.cfg
@@ -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