X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/c7d6e1faed6cfa8add0fcb975b5d5a864ed6c1d9..f2344eab0f6a1a19f9d4be8a58252fedeea1cb2d:/packages/glib/build.sh

diff --git a/packages/glib/build.sh b/packages/glib/build.sh
index cf721505..94025527 100755
--- a/packages/glib/build.sh
+++ b/packages/glib/build.sh
@@ -1,8 +1,7 @@
 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_PKG_VERSION=${_TERMUX_GLIB_MAJOR_VERSION}.2
-TERMUX_PKG_BUILD_REVISION=2
+_TERMUX_GLIB_MAJOR_VERSION=2.48
+TERMUX_PKG_VERSION=${_TERMUX_GLIB_MAJOR_VERSION}.1
 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"
 
@@ -11,6 +10,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-compile-warnings --disable-gtk-doc --
 # --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_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__
@@ -18,14 +18,14 @@ CFLAGS="$CFLAGS -D__BIONIC__=1"
 
 termux_step_pre_configure () {
 	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
+	echo "glib_cv_uscore=no" >> termux_configure.cache
+        #echo "ac_cv_func_posix_getpwuid_r=yes" >> termux_configure.cache
+        #echo "ac_cv_func_posix_getgrgid_r=yes" >> termux_configure.cache
+        #echo "ac_cv_func_posix_getpwnam_r=yes" >> termux_configure.cache
+        #echo "ac_cv_func_posix_getpwuid_r=yes" >> termux_configure.cache
+        #echo "ac_cv_header_pwd_h=no" >> termux_configure.cache
 	chmod a-w termux_configure.cache		# prevent configure from changing
 }