summaryrefslogtreecommitdiffhomepage
path: root/vars
diff options
context:
space:
mode:
Diffstat (limited to 'vars')
-rw-r--r--vars/build.vars5
-rw-r--r--vars/libgpg_error.vars9
2 files changed, 12 insertions, 2 deletions
diff --git a/vars/build.vars b/vars/build.vars
index d72e0309..5346f93b 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -596,8 +596,8 @@ HOST_PACKAGES_DEPS_PREFIX="${PREFIX}";
: ${PKG_GLIB_HOST_VERSION:=2.54.0};
: ${PKG_GLIB_HOST_URL:=http://ftp.gnome.org/pub/GNOME/sources/glib/${PKG_GLIB_HOST_VERSION%.[0-9]}/glib-${PKG_GLIB_HOST_VERSION}.tar.xz};
: ${PKG_GLIB_HOST_BUILD_STEPS_DISABLE:=configure_patch};
-: ${PKG_GLIB_HOST_CONFIGURE_ARGS_EXTRA:="--disable-dtrace --disable-libelf --disable-libmount"};
-: ${PKG_GLIB_HOST_CFLAGS_BUILD_EXTRA:="-Wno-format-nonliteral -Wno-format-overflow"};
+: ${PKG_GLIB_HOST_CONFIGURE_ARGS_EXTRA:="--with-pcre=internal --disable-dtrace --disable-libelf --disable-libmount"};
+: ${PKG_GLIB_HOST_CFLAGS_BUILD_EXTRA:="-Wno-missing-include-dirs -Wno-format-nonliteral -Wno-format-overflow"};
: ${PKG_GLIB_HOST_ENV_VARS_EXTRA:="LIBFFI_CFLAGS=-I${PREFIX}/lib/libffi-${PKG_LIBFFI_HOST_VERSION}/include:LIBFFI_LIBS=-L${PREFIX}/lib -lffi"};
: ${PKG_GLIB_HOST_LDFLAGS_CONFIGURE_EXTRA:=-L${PREFIX}/lib};
: ${PKG_DBUS_HOST_VERSION:=1.11.20};
@@ -843,6 +843,7 @@ NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python2";
: ${PKG_LIBGPG_ERROR_SHA256SUM:=f628f75843433b38b05af248121beb7db5bd54bb2106f384edac39934261320c};
: ${PKG_LIBGPG_ERROR_VERSION:=1.25};
: ${PKG_LIBGPG_ERROR_URL:=https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-${PKG_LIBGPG_ERROR_VERSION}.tar.bz2};
+: ${PKG_LIBGPG_ERROR_IN_TREE:=1};
: ${PKG_LIBASSUAN_SHA256SUM:=47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449};
: ${PKG_LIBASSUAN_VERSION:=2.5.1};
: ${PKG_LIBASSUAN_URL:=https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-${PKG_LIBASSUAN_VERSION}.tar.bz2};
diff --git a/vars/libgpg_error.vars b/vars/libgpg_error.vars
new file mode 100644
index 00000000..a7e5eada
--- /dev/null
+++ b/vars/libgpg_error.vars
@@ -0,0 +1,9 @@
+#
+# set -o errexit -o noglob are assumed.
+#
+
+pkg_libgpg_error_configure_autotools_pre() {
+ autoreconf -ivf;
+};
+
+# vim:filetype=sh