From ec6e9d7dd65260eddcc49b5e05655447b04cb40d Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 21 Apr 2011 20:15:33 +0200 Subject: [PATCH 1/4] Revert "scripts/checkdeps: cleanup, we are building and installing our own autotools" This reverts commit eb1e95e939bad884c860eaf31d8beb8440ceb704. --- scripts/checkdeps | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/checkdeps b/scripts/checkdeps index a03f1a3f63..0ae4cf54c2 100755 --- a/scripts/checkdeps +++ b/scripts/checkdeps @@ -33,10 +33,10 @@ case $1 in deps_pkg="wget" ;; build) - deps="gcc g++ sed patch touch tar bzip2 gzip lzma perl cp gawk makeinfo gettext autopoint gperf cvs zip unzip mkfontscale diff xsltproc msgfmt" - deps_pkg="gcc g++ sed patch fileutils tar bzip2 gzip lzma perl coreutils gawk texinfo gettext gettext-devel gperf cvs zip unzip xutils diff xsltproc gettext" - files="/usr/lib/libc.a /usr/include/stdio.h /usr/include/zlib.h /usr/include/ncurses.h" - files_pkg="glibc-static libc6-dev zlib1g-dev libncurses5-dev" + deps="gcc g++ sed patch touch tar bzip2 gzip lzma perl cp gawk makeinfo gettext autopoint gperf autoconf automake m4 cvs zip unzip mkfontscale libtool diff xsltproc msgfmt" + deps_pkg="gcc g++ sed patch fileutils tar bzip2 gzip lzma perl coreutils gawk texinfo gettext gettext-devel gperf autoconf automake m4 cvs zip unzip xutils libtool diff xsltproc gettext" + files="/usr/lib/libc.a /usr/include/stdio.h /usr/include/zlib.h /usr/include/ncurses.h /usr/lib/perl5/XML/Parser.pm" + files_pkg="glibc-static libc6-dev zlib1g-dev libncurses5-dev perl-XML-Parser" ;; qemu) if [ ! `which qemu` ]; then From 8d0bd2acf02368ac4102c2ab2af70f914ccd3946 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 21 Apr 2011 20:16:09 +0200 Subject: [PATCH 2/4] Revert "autoconf-2.64: dont depend on libtool-host" This reverts commit e5dc6a6e15934b6b5bf2aef43a29ab1996f13726. --- packages/toolchain/devel/autotools/autoconf-2.64/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/toolchain/devel/autotools/autoconf-2.64/meta b/packages/toolchain/devel/autotools/autoconf-2.64/meta index a24a33c639..b2a865c43d 100644 --- a/packages/toolchain/devel/autotools/autoconf-2.64/meta +++ b/packages/toolchain/devel/autotools/autoconf-2.64/meta @@ -26,7 +26,7 @@ PKG_LICENSE="GPL" PKG_SITE="http://sources.redhat.com/autoconf/" PKG_URL="http://ftp.gnu.org/gnu/autoconf/$PKG_NAME.tar.bz2" PKG_DEPENDS="" -PKG_BUILD_DEPENDS="ccache m4" +PKG_BUILD_DEPENDS="ccache m4 libtool-host" PKG_PRIORITY="optional" PKG_SECTION="toolchain/devel" PKG_SHORTDESC="autoconf: A GNU tool for automatically configuring source code" From 55b99846ff1c5b3f8f588374f8e20770cd5c1c2c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 21 Apr 2011 20:16:29 +0200 Subject: [PATCH 3/4] Revert "autoconf: dont depend on libtool-host" This reverts commit 0c3ae6b0a01f636c30d1bb54871697ee3bc24767. --- packages/toolchain/devel/autotools/autoconf/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/toolchain/devel/autotools/autoconf/meta b/packages/toolchain/devel/autotools/autoconf/meta index 4aa0eb456a..7ac89b1cdf 100644 --- a/packages/toolchain/devel/autotools/autoconf/meta +++ b/packages/toolchain/devel/autotools/autoconf/meta @@ -26,7 +26,7 @@ PKG_LICENSE="GPL" PKG_SITE="http://sources.redhat.com/autoconf/" PKG_URL="http://ftp.gnu.org/gnu/autoconf/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS="" -PKG_BUILD_DEPENDS="ccache m4" +PKG_BUILD_DEPENDS="ccache m4 libtool-host" PKG_PRIORITY="optional" PKG_SECTION="toolchain/devel" PKG_SHORTDESC="autoconf: A GNU tool for automatically configuring source code" From 264074e2dc3d02689a6bcabfc1e2f94e1873672e Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 21 Apr 2011 20:16:58 +0200 Subject: [PATCH 4/4] Revert "libtool-host: depends on autoconf" This reverts commit 9266dcacb8e2454f4ba9a4ca69b9590dbc4417b5. --- packages/toolchain/devel/autotools/libtool-host/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/toolchain/devel/autotools/libtool-host/meta b/packages/toolchain/devel/autotools/libtool-host/meta index a32fae2a24..36b315c854 100644 --- a/packages/toolchain/devel/autotools/libtool-host/meta +++ b/packages/toolchain/devel/autotools/libtool-host/meta @@ -26,7 +26,7 @@ PKG_LICENSE="GPL" PKG_SITE="http://www.gnu.org/software/libtool/libtool.html" PKG_URL="" PKG_DEPENDS="" -PKG_BUILD_DEPENDS="ccache autoconf" +PKG_BUILD_DEPENDS="ccache" PKG_PRIORITY="optional" PKG_SECTION="toolchain/devel" PKG_SHORTDESC="libtool: Generic library support script"