Skip to content

Commit

Permalink
Bump glib to latest version (and build with meson)
Browse files Browse the repository at this point in the history
  • Loading branch information
ankith26 committed Nov 6, 2023
1 parent 6b9afd0 commit 44715fd
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 27 deletions.
19 changes: 9 additions & 10 deletions buildconfig/manylinux-build/docker_base/glib/build-glib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,20 @@ 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
meson _build $PG_BASE_MESON_FLAGS -Dtests=false \
-Dselinux=disabled -Dlibmount=disabled -Ddtrace=false -Dsystemtap=false

ninja -C _build
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
2 changes: 1 addition & 1 deletion buildconfig/manylinux-build/docker_base/glib/glib.sha512
Original file line number Diff line number Diff line change
@@ -1 +1 @@
280a46c2af13283a08c15ff0b4f5492659c2884521930600ad45310ed181c44a878ad8f9b36bae68ed6e7d92db6f1630f7bf015148c513dc317d25807f13abb0 glib-2.56.4.tar.xz
aa9ed9195951b00ac8221e958ea337fbda82621a862ef8f29dc2ea396a6253ce51c2a0a498dfa4e12642f1836f85f9564f09991979ae85c5ed4368355d857376 glib-2.78.1.tar.xz
16 changes: 0 additions & 16 deletions buildconfig/manylinux-build/docker_base/glib/macos_arm64.cache

This file was deleted.

0 comments on commit 44715fd

Please sign in to comment.