glib: Avoid defining invalid RTLD_* constants

This commit is contained in:
Fredrik Fornwall 2015-12-17 18:33:24 -05:00
parent dd15f7cf28
commit 9158a301e0
2 changed files with 22 additions and 0 deletions

View File

@ -2,6 +2,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_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.46
TERMUX_PKG_VERSION=${_TERMUX_GLIB_MAJOR_VERSION}.2 TERMUX_PKG_VERSION=${_TERMUX_GLIB_MAJOR_VERSION}.2
TERMUX_PKG_BUILD_REVISION=1
TERMUX_PKG_SRCURL=http://ftp.gnome.org/pub/gnome/sources/glib/${_TERMUX_GLIB_MAJOR_VERSION}/glib-${TERMUX_PKG_VERSION}.tar.xz 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_DEPENDS="libffi, pcre"

View File

@ -0,0 +1,21 @@
diff -u -r ../glib-2.46.2/gmodule/gmodule-dl.c ./gmodule/gmodule-dl.c
--- ../glib-2.46.2/gmodule/gmodule-dl.c 2014-10-04 20:08:22.000000000 -0400
+++ ./gmodule/gmodule-dl.c 2015-12-17 18:28:32.091292946 -0500
@@ -57,6 +57,9 @@
* RTLD_GLOBAL - the external symbols defined in the library will be made
* available to subsequently loaded libraries.
*/
+#ifndef __ANDROID__
+/* On Android the RTLD_* constants are enum values, so they
+ cannot be checked with ifdef, and values are different. */
#ifndef RTLD_LAZY
#define RTLD_LAZY 1
#endif /* RTLD_LAZY */
@@ -70,6 +73,7 @@
#ifndef RTLD_GLOBAL
#define RTLD_GLOBAL 0
#endif /* RTLD_GLOBAL */
+#endif
/* --- functions --- */