Ping On Tue, Mar 5, 2024 at 4:13 PM Kinsey Moore <kinsey.mo...@oarcorp.com> wrote:
> This updates glib to 2.56.4 for AArch64 build support. > --- > bare/config/devel/glib-2.56.4-1.cfg | 30 ++++++++++++++++++++++++++ > bare/config/devel/qemu-couverture.bset | 2 +- > bare/config/devel/qemu-xilinx.bset | 2 +- > bare/config/devel/qemu.bset | 2 +- > source-builder/config/glib-2-1.cfg | 1 + > 5 files changed, 34 insertions(+), 3 deletions(-) > create mode 100644 bare/config/devel/glib-2.56.4-1.cfg > > diff --git a/bare/config/devel/glib-2.56.4-1.cfg > b/bare/config/devel/glib-2.56.4-1.cfg > new file mode 100644 > index 0000000..175b060 > --- /dev/null > +++ b/bare/config/devel/glib-2.56.4-1.cfg > @@ -0,0 +1,30 @@ > +# > +# GLib > +# > + > +%if %{release} == %{nil} > +%define release 1 > +%endif > + > +%include %{_configdir}/base.cfg > + > +%define glib_version_major 2.56 > +%define glib_version_minor 4 > +%define glib_version %{glib_version_major}.%{glib_version_minor} > + > +%hash sha256 glib-%{glib_version}.tar.xz > J/cD0SXvsH+KdDZmtYDfC0CVxZ/IdQ6IkBMskdQ3UEw= > + > +# > +#Add patches to suppress null argument warning > +# > + > +%patch add glib > https://devel.rtems.org/raw-attachment/ticket/4634/566e1d61a500267c7849ad0b2552feec9c9a29a6.patch > +%hash sha512 566e1d61a500267c7849ad0b2552feec9c9a29a6.patch \ > + > > ULwUKgmgGLAOlgsr09K2GdYVGm8yzffwWRGRZTi5B8KdMuyAE+Y0eFOAg2L77aVG3o14l6x9qNA1DH8uMYKOcw== > + > +# > +# The GLib build instructions. We use 2.x.x Release 1. > +# > +%if !%{pkgconfig check glib-2.0} || %{defined _rsb_getting_source} > + %include %{_configdir}/glib-2-1.cfg > +%endif > diff --git a/bare/config/devel/qemu-couverture.bset > b/bare/config/devel/qemu-couverture.bset > index 60bec8e..69f6dfb 100644 > --- a/bare/config/devel/qemu-couverture.bset > +++ b/bare/config/devel/qemu-couverture.bset > @@ -21,6 +21,6 @@ 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.48.2-1 > +devel/glib-2.56.4-1 > devel/dtc-1.6.1-1 > devel/qemu-couverture-git-1 > diff --git a/bare/config/devel/qemu-xilinx.bset > b/bare/config/devel/qemu-xilinx.bset > index 91b07e8..5bcbe2f 100644 > --- a/bare/config/devel/qemu-xilinx.bset > +++ b/bare/config/devel/qemu-xilinx.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.40.0-1 > -devel/glib-2.48.2-1 > +devel/glib-2.56.4-1 > devel/qemu-xilinx-v2020.2-1 > diff --git a/bare/config/devel/qemu.bset b/bare/config/devel/qemu.bset > index 3a9b0d5..7de2ca4 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.40.0-1 > -devel/glib-2.48.2-1 > +devel/glib-2.56.4-1 > devel/qemu-5.2.0-1 > diff --git a/source-builder/config/glib-2-1.cfg > b/source-builder/config/glib-2-1.cfg > index 09b43fa..5f80db0 100644 > --- a/source-builder/config/glib-2-1.cfg > +++ b/source-builder/config/glib-2-1.cfg > @@ -60,6 +60,7 @@ URL: https://developer.gnome.org/glib/ > --build=%{_build} --host=%{_host} \ > --with-sysroot=$SYSROOT \ > --disable-dtrace \ > + --enable-libmount=no \ > --with-pcre=internal > > %{_ld_library_path}=$SYSROOT/lib \ > -- > 2.39.2 > > _______________________________________________ > devel mailing list > devel@rtems.org > http://lists.rtems.org/mailman/listinfo/devel >
_______________________________________________ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel