From 42a8ad59f9916fb1aaf5fdd8a5ae6dcb55b1b7b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Wed, 2 Aug 2017 22:33:08 +0200 Subject: vars/build.vars: build expat and libxml2 before apr_util (via hanetzer.) patches/expat-2.2.0.local.patch: remove ${LIBTOOL} override. --- patches/expat-2.2.0.local.patch | 13 +++++++++++++ vars/build.vars | 6 +++--- 2 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 patches/expat-2.2.0.local.patch diff --git a/patches/expat-2.2.0.local.patch b/patches/expat-2.2.0.local.patch new file mode 100644 index 00000000..b6f1446b --- /dev/null +++ b/patches/expat-2.2.0.local.patch @@ -0,0 +1,13 @@ +--- expat-2.2.0/configure.orig 2016-06-21 15:52:05.000000000 +0200 ++++ expat-2.2.0/configure 2017-08-02 22:31:27.913780534 +0200 +@@ -7493,8 +7493,8 @@ + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS=$ltmain + +-# Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++# NEIN ++# LIBTOOL='$(top_builddir)/libtool' + + + diff --git a/vars/build.vars b/vars/build.vars index c9059a0c..16137fbf 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -253,9 +253,9 @@ LIB_PACKAGES_CONFIGURE_ARGS="-C --disable-nls --host=${TARGET} --prefix= --targe LIB_PACKAGES_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}"; LIB_PACKAGES_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}"; LIB_PACKAGES_PACKAGES_LEAVES=" -apr apr_util bzip2 curl expat libz libpng libffi gdbm geoip pcre glib gzip libarchive libatomic_ops -libpipeline libressl libevent libfetch libgpg_error libassuan libfirm libgcrypt libksba libxml2 -lua ncurses ncursestw ncursesw npth sqlite3 xz"; +expat libxml2 apr apr_util bzip2 curl libz libpng libffi gdbm geoip pcre glib gzip libarchive +libatomic_ops libpipeline libressl libevent libfetch libgpg_error libassuan libfirm libgcrypt +libksba lua ncurses ncursestw ncursesw npth sqlite3 xz"; LIB_PACKAGES_PACKAGES_X11=" inputproto kbproto xcb_proto xproto libXau libpthread_stubs xcb xextproto xtrans libX11 libXext freetype fontconfig renderproto Xrender libXft libICE libSM libXt libXmu libXpm -- cgit v1.2.3