From 823f523bdcdfdfc866ca2dd6a9d96f5fc644cf87 Mon Sep 17 00:00:00 2001 From: Ankith Date: Mon, 6 Nov 2023 11:59:19 +0530 Subject: [PATCH] Bump glib to latest version (and build with meson) --- buildconfig/macdependencies/build_mac_deps.sh | 4 ++-- .../docker_base/Dockerfile-aarch64 | 5 +++-- .../docker_base/Dockerfile-i686 | 5 +++-- .../docker_base/Dockerfile-x86_64 | 5 +++-- .../docker_base/glib/build-glib.sh | 20 +++++++++---------- .../docker_base/glib/glib.sha512 | 2 +- .../docker_base/glib/macos_arm64.cache | 16 --------------- 7 files changed, 22 insertions(+), 35 deletions(-) delete mode 100644 buildconfig/manylinux-build/docker_base/glib/macos_arm64.cache diff --git a/buildconfig/macdependencies/build_mac_deps.sh b/buildconfig/macdependencies/build_mac_deps.sh index b73dd499f2..65bdacc1b8 100644 --- a/buildconfig/macdependencies/build_mac_deps.sh +++ b/buildconfig/macdependencies/build_mac_deps.sh @@ -95,8 +95,8 @@ bash mpg123/build-mpg123.sh bash opus/build-opus.sh # needs libogg (which is a container format) # fluidsynth (for sdl_mixer) -bash gettext/build-gettext.sh -bash glib/build-glib.sh # depends on gettext +# bash gettext/build-gettext.sh +bash glib/build-glib.sh bash sndfile/build-sndfile.sh bash fluidsynth/build-fluidsynth.sh diff --git a/buildconfig/manylinux-build/docker_base/Dockerfile-aarch64 b/buildconfig/manylinux-build/docker_base/Dockerfile-aarch64 index 5fa6e131c6..26d239b682 100644 --- a/buildconfig/manylinux-build/docker_base/Dockerfile-aarch64 +++ b/buildconfig/manylinux-build/docker_base/Dockerfile-aarch64 @@ -97,8 +97,9 @@ RUN ["bash", "/libmodplug_build/build-libmodplug.sh"] ADD libffi /libffi_build/ RUN ["bash", "/libffi_build/build-libffi.sh"] -ADD gettext /gettext_build/ -RUN ["bash", "/gettext_build/build-gettext.sh"] +# explicit install not needed anymore +# ADD gettext /gettext_build/ +# RUN ["bash", "/gettext_build/build-gettext.sh"] ADD glib /glib_build/ RUN ["bash", "/glib_build/build-glib.sh"] diff --git a/buildconfig/manylinux-build/docker_base/Dockerfile-i686 b/buildconfig/manylinux-build/docker_base/Dockerfile-i686 index 1bcf99d322..ab04ce3613 100644 --- a/buildconfig/manylinux-build/docker_base/Dockerfile-i686 +++ b/buildconfig/manylinux-build/docker_base/Dockerfile-i686 @@ -97,8 +97,9 @@ RUN ["linux32", "bash", "/libmodplug_build/build-libmodplug.sh"] ADD libffi /libffi_build/ RUN ["bash", "/libffi_build/build-libffi.sh"] -ADD gettext /gettext_build/ -RUN ["bash", "/gettext_build/build-gettext.sh"] +# explicit install not needed anymore +# ADD gettext /gettext_build/ +# RUN ["bash", "/gettext_build/build-gettext.sh"] ADD glib /glib_build/ RUN ["bash", "/glib_build/build-glib.sh"] diff --git a/buildconfig/manylinux-build/docker_base/Dockerfile-x86_64 b/buildconfig/manylinux-build/docker_base/Dockerfile-x86_64 index c18c6c5897..2759724079 100644 --- a/buildconfig/manylinux-build/docker_base/Dockerfile-x86_64 +++ b/buildconfig/manylinux-build/docker_base/Dockerfile-x86_64 @@ -97,8 +97,9 @@ RUN ["bash", "/libmodplug_build/build-libmodplug.sh"] ADD libffi /libffi_build/ RUN ["bash", "/libffi_build/build-libffi.sh"] -ADD gettext /gettext_build/ -RUN ["bash", "/gettext_build/build-gettext.sh"] +# explicit install not needed anymore +# ADD gettext /gettext_build/ +# RUN ["bash", "/gettext_build/build-gettext.sh"] ADD glib /glib_build/ RUN ["bash", "/glib_build/build-glib.sh"] diff --git a/buildconfig/manylinux-build/docker_base/glib/build-glib.sh b/buildconfig/manylinux-build/docker_base/glib/build-glib.sh index b7571bbea8..6c4ce409bc 100644 --- a/buildconfig/manylinux-build/docker_base/glib/build-glib.sh +++ b/buildconfig/manylinux-build/docker_base/glib/build-glib.sh @@ -3,21 +3,21 @@ set -e -x cd $(dirname `readlink -f "$0"`) -GLIB=glib-2.56.4 +GLIB_VER="2.78" +GLIB_PATCH="1" +GLIB="glib-${GLIB_VER}.${GLIB_PATCH}" -curl -sL --retry 10 https://download.gnome.org/sources/glib/2.56/${GLIB}.tar.xz > ${GLIB}.tar.xz +curl -sL --retry 10 https://download.gnome.org/sources/glib/${GLIB_VER}/${GLIB}.tar.xz > ${GLIB}.tar.xz sha512sum -c glib.sha512 unxz ${GLIB}.tar.xz tar xf ${GLIB}.tar cd $GLIB -if [[ "$MAC_ARCH" == "arm64" ]]; then - # pass a 'cache' file while cross compiling to arm64 for glib. This is - # needed for glib to determine some info about the target architecture - export GLIB_COMPILE_EXTRA_FLAGS="--cache-file=../macos_arm64.cache" -fi +# a minimal glib install will do for us +meson _build $PG_BASE_MESON_FLAGS -Dtests=false \ + -Dselinux=disabled -Dlibmount=disabled -Ddtrace=false -Dsystemtap=false -Dnls=disabled + +ninja -C _build +sudo ninja -C _build install -CFLAGS=-Wno-error ./configure $PG_BASE_CONFIGURE_FLAGS --with-pcre=internal $GLIB_COMPILE_EXTRA_FLAGS --disable-libmount --disable-dbus -make -make install diff --git a/buildconfig/manylinux-build/docker_base/glib/glib.sha512 b/buildconfig/manylinux-build/docker_base/glib/glib.sha512 index ce5aca768b..a1365d9df6 100644 --- a/buildconfig/manylinux-build/docker_base/glib/glib.sha512 +++ b/buildconfig/manylinux-build/docker_base/glib/glib.sha512 @@ -1 +1 @@ -280a46c2af13283a08c15ff0b4f5492659c2884521930600ad45310ed181c44a878ad8f9b36bae68ed6e7d92db6f1630f7bf015148c513dc317d25807f13abb0 glib-2.56.4.tar.xz +aa9ed9195951b00ac8221e958ea337fbda82621a862ef8f29dc2ea396a6253ce51c2a0a498dfa4e12642f1836f85f9564f09991979ae85c5ed4368355d857376 glib-2.78.1.tar.xz diff --git a/buildconfig/manylinux-build/docker_base/glib/macos_arm64.cache b/buildconfig/manylinux-build/docker_base/glib/macos_arm64.cache deleted file mode 100644 index ef5bb82bdb..0000000000 --- a/buildconfig/manylinux-build/docker_base/glib/macos_arm64.cache +++ /dev/null @@ -1,16 +0,0 @@ -glib_cv_stack_grows=no -glib_cv_uscore=no -ac_cv_func_posix_getpwuid_r=yes -ac_cv_func_posix_getgrgid_r=yes -ac_cv_alignof_guint32=4 -ac_cv_alignof_guint64=8 -ac_cv_alignof_unsigned_long=8 -glib_cv_long_long_format=ll -glib_cv_sane_realloc=yes -glib_cv_have_strlcpy=no -glib_cv_va_val_copy=yes -glib_cv_rtldglobal_broken=no -glib_cv_monotonic_clock=no -ac_cv_func_nonposix_getpwuid_r=no -ac_cv_func_printf_unix98=no -ac_cv_func_vsnprintf_c99=yes