diff --git a/config/functions b/config/functions index 057254790b..7ce4741dc1 100644 --- a/config/functions +++ b/config/functions @@ -372,7 +372,11 @@ do_autoreconf() { if [ -e "$TOOLCHAIN/bin/autoreconf" -a -e "$INTLTOOLIZE" ]; then mkdir -p $ACLOCAL_DIR - export AUTORECONF="$TOOLCHAIN/bin/autoreconf --verbose --force --install -I $ACLOCAL_DIR" + if [ -e "$LIBTOOLIZE" ]; then + export AUTORECONF="$TOOLCHAIN/bin/autoreconf --verbose --force --install -I $ACLOCAL_DIR" + else + export AUTORECONF="$TOOLCHAIN/bin/autoreconf --verbose --force -I $ACLOCAL_DIR" + fi $AUTORECONF $@ fi } diff --git a/packages/devel/libtool/package.mk b/packages/devel/libtool/package.mk index ed295f6649..129b750f19 100644 --- a/packages/devel/libtool/package.mk +++ b/packages/devel/libtool/package.mk @@ -28,6 +28,6 @@ PKG_DEPENDS_TARGET="toolchain" PKG_SECTION="devel" PKG_SHORTDESC="libtool: Generic library support script" PKG_LONGDESC="This is GNU Libtool, a generic library support script. Libtool hides the complexity of using shared libraries behind a consistent, portable interface." -PKG_AUTORECONF="no" +PKG_AUTORECONF="yes" PKG_CONFIGURE_OPTS_HOST="--enable-static --disable-shared" diff --git a/packages/virtual/autotools/package.mk b/packages/virtual/autotools/package.mk index bf7f74c90c..d095ab6bb4 100644 --- a/packages/virtual/autotools/package.mk +++ b/packages/virtual/autotools/package.mk @@ -22,7 +22,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.openelec.tv" PKG_URL="" -PKG_DEPENDS_HOST="ccache:host autoconf:host automake:host libtool:host intltool:host autoconf-archive:host" +PKG_DEPENDS_HOST="ccache:host autoconf:host automake:host intltool:host libtool:host autoconf-archive:host" PKG_SECTION="virtual" PKG_SHORTDESC="autotools: Metapackage" PKG_LONGDESC="autotools: Metapackage" diff --git a/packages/virtual/toolchain/package.mk b/packages/virtual/toolchain/package.mk index 4bb3981b67..5a83ca1a6c 100644 --- a/packages/virtual/toolchain/package.mk +++ b/packages/virtual/toolchain/package.mk @@ -22,7 +22,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://libreelec.tv" PKG_URL="" -PKG_DEPENDS_TARGET="configtools:host make:host xz:host sed:host pkg-config:host autoconf:host automake:host libtool:host intltool:host autoconf-archive:host gcc:host bison:host flex:host cmake:host xmlstarlet:host yasm:host p7zip:host ninja:host" +PKG_DEPENDS_TARGET="configtools:host make:host xz:host sed:host pkg-config:host autoconf:host automake:host intltool:host libtool:host autoconf-archive:host gcc:host bison:host flex:host cmake:host xmlstarlet:host yasm:host p7zip:host ninja:host" PKG_SECTION="virtual" PKG_SHORTDESC="toolchain: LibreELEC.tv' toolchain" PKG_LONGDESC="a crosscompiling toolchain to compile all packages"