X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/14e7b6ecfea408aaf0138ee6b1da08e781b5c52d..6aa5925514efdf909f1c0dba8113eefa8fd06d45:/packages/glib/build.sh

diff --git a/packages/glib/build.sh b/packages/glib/build.sh
index 58295654..e1b9535b 100755
--- a/packages/glib/build.sh
+++ b/packages/glib/build.sh
@@ -1,27 +1,31 @@
 TERMUX_PKG_HOMEPAGE=https://developer.gnome.org/glib/
 TERMUX_PKG_DESCRIPTION="Library providing core building blocks for libraries and applications written in C"
-_TERMUX_GLIB_MAJOR_VERSION=2.46
+_TERMUX_GLIB_MAJOR_VERSION=2.50
 TERMUX_PKG_VERSION=${_TERMUX_GLIB_MAJOR_VERSION}.2
-TERMUX_PKG_SRCURL=http://ftp.gnome.org/pub/gnome/sources/glib/${_TERMUX_GLIB_MAJOR_VERSION}/glib-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_DEPENDS="libffi, pcre"
+TERMUX_PKG_SRCURL=https://ftp.gnome.org/pub/gnome/sources/glib/${_TERMUX_GLIB_MAJOR_VERSION}/glib-${TERMUX_PKG_VERSION}.tar.xz
+# libandroid-support to get langinfo.h in include path.
+TERMUX_PKG_DEPENDS="libffi, pcre, libandroid-support"
+TERMUX_PKG_RM_AFTER_INSTALL="share/gtk-doc share/locale share/glib-2.0/gettext share/gdb/auto-load share/glib-2.0/codegen share/glib-2.0/gdb bin/gtester-report bin/glib-mkenums bin/glib-gettextize bin/gdbus-codegen"
+# Needed by pkg-config for glib-2.0:
+TERMUX_PKG_DEVPACKAGE_DEPENDS="pcre-dev"
+TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="lib/glib-2.0/include"
 
 # --enable-compile-warnings=no to get rid of format strings causing errors
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-compile-warnings --disable-gtk-doc --disable-gtk-doc-html --cache-file=termux_configure.cache --with-pcre=system"
-TERMUX_PKG_RM_AFTER_INSTALL="share/gtk-doc share/locale share/glib-2.0/gettext share/gdb/auto-load share/glib-2.0/codegen share/glib-2.0/gdb lib/glib-2.0/include bin/gtester-report bin/glib-mkenums bin/glib-gettextize bin/gdbus-codegen"
-
-# glib checks for __BIONIC__ instead of __ANDROID__
-CFLAGS="$CFLAGS -D__BIONIC__=1"
+# --disable-znodelete to avoid DF_1_NODELETE which most Android 5.0 linkers does not support:
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --disable-znodelete"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --disable-libelf"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --disable-libmount"
 
 termux_step_pre_configure () {
+	# glib checks for __BIONIC__ instead of __ANDROID__:
+	CFLAGS="$CFLAGS -D__BIONIC__=1"
+
 	cd $TERMUX_PKG_BUILDDIR
-	# https://developer.gnome.org/glib/2.37/glib-cross-compiling.html
+
+	# https://developer.gnome.org/glib/stable/glib-cross-compiling.html
 	echo "glib_cv_long_long_format=ll" >> termux_configure.cache
 	echo "glib_cv_stack_grows=no" >> termux_configure.cache
-	echo "glib_cv_uscore=yes" >> termux_configure.cache
-	echo "ac_cv_func_posix_getpwuid_r=yes" >> termux_configure.cache
-	echo "ac_cv_func_posix_getgrgid_r=no" >> termux_configure.cache
-	echo "ac_cv_func_posix_getpwnam_r=no" >> termux_configure.cache
-	echo "ac_cv_func_posix_getpwuid_r=no" >> termux_configure.cache
-	echo "ac_cv_header_pwd_h=no" >> termux_configure.cache
-	chmod a-w termux_configure.cache		# prevent configure from changing
+	echo "glib_cv_uscore=no" >> termux_configure.cache
+	chmod a-w termux_configure.cache
 }