diff --git a/packages/toolchain/devel/autotools/autoconf-archive/meta b/packages/devel/autoconf-archive/package.mk similarity index 81% rename from packages/toolchain/devel/autotools/autoconf-archive/meta rename to packages/devel/autoconf-archive/package.mk index 0259d75c95..2f9e7c6730 100644 --- a/packages/toolchain/devel/autotools/autoconf-archive/meta +++ b/packages/devel/autoconf-archive/package.mk @@ -23,12 +23,22 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://ftp.gnu.org/gnu/autoconf-archive" PKG_URL="http://ftp.gnu.org/gnu/autoconf-archive/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="ccache:host" +PKG_DEPENDS_HOST="" +PKG_BUILD_DEPENDS_HOST="ccache:host" PKG_PRIORITY="optional" PKG_SECTION="toolchain/devel" PKG_SHORTDESC="autoconf-archive: macros for autoconf" PKG_LONGDESC="autoconf-archive is an package of m4 macros" -PKG_IS_ADDON="no" +PKG_IS_ADDON="no" PKG_AUTORECONF="no" + +PKG_CONFIGURE_OPTS_HOST="--target=$TARGET_NAME --prefix=$ROOT/$TOOLCHAIN" + +makeinstall_host() { +# make install + make prefix=$SYSROOT_PREFIX/usr install + +# remove problematic m4 file + rm -rf $SYSROOT_PREFIX/usr/share/aclocal/ax_prog_cc_for_build.m4 +} diff --git a/packages/toolchain/devel/autotools/autoconf-archive/build b/packages/toolchain/devel/autotools/autoconf-archive/build deleted file mode 100755 index 2a65ae6d5d..0000000000 --- a/packages/toolchain/devel/autotools/autoconf-archive/build +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) -# -# OpenELEC is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# OpenELEC is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC. If not, see . -################################################################################ - -. config/options $1 - -setup_toolchain host - -cd $PKG_BUILD - -./configure --host=$HOST_NAME \ - --build=$HOST_NAME \ - --target=$TARGET_NAME \ - --prefix=$ROOT/$TOOLCHAIN \ - -make - -# make install - make prefix=$SYSROOT_PREFIX/usr install - -# remove problematic m4 file - rm -rf $SYSROOT_PREFIX/usr/share/aclocal/ax_prog_cc_for_build.m4 \ No newline at end of file diff --git a/packages/toolchain/devel/autotools/meta b/packages/toolchain/devel/autotools/meta index 4bf67157fb..8ef1fe205e 100644 --- a/packages/toolchain/devel/autotools/meta +++ b/packages/toolchain/devel/autotools/meta @@ -24,7 +24,7 @@ PKG_LICENSE="GPL" PKG_SITE="http://www.openelec.tv" PKG_URL="" PKG_DEPENDS="" -PKG_BUILD_DEPENDS="ccache:host autoconf automake libtool:host intltool autoconf-archive" +PKG_BUILD_DEPENDS="ccache:host autoconf automake libtool:host intltool autoconf-archive:host" PKG_PRIORITY="optional" PKG_SECTION="toolchain/devel" PKG_SHORTDESC="autotools: Metapackage"