From 2462ab577d9f8bbec900474a5d730c8f4a7ec3cd Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Thu, 27 Nov 2014 21:55:38 +0100
Subject: [PATCH] Drop autotools and libtool from haikuports.cross.

* None of these are required to be cross-built, as they all can be built on
  the bootstrap image just fine.
* Additionally, update bash_boostrap from 4.27 to 4.30, as 4.27 causes the
  build of gcc on the bootstrap image to fail.
---
 build/jam/DefaultBuildProfiles                |  4 ----
 build/jam/repositories/HaikuPortsCross/x86_64 | 10 +---------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/build/jam/DefaultBuildProfiles b/build/jam/DefaultBuildProfiles
index 2c942d56bc..4cf0c76329 100644
--- a/build/jam/DefaultBuildProfiles
+++ b/build/jam/DefaultBuildProfiles
@@ -153,8 +153,6 @@ rule DefineDefaultBuildProfiles
 			HAIKU_IMAGE_SIZE ?= 20000 ;
 
 			AddHaikuImagePackages
-				autoconf
-				automake
 				binutils
 				bison
 				curl_devel
@@ -165,8 +163,6 @@ rule DefineDefaultBuildProfiles
 				grep
 				haikuporter
 				less
-				libtool
-				libtool_libltdl
 				m4
 				make
 				ncurses
diff --git a/build/jam/repositories/HaikuPortsCross/x86_64 b/build/jam/repositories/HaikuPortsCross/x86_64
index c8d0841ad9..7cb4828b8a 100644
--- a/build/jam/repositories/HaikuPortsCross/x86_64
+++ b/build/jam/repositories/HaikuPortsCross/x86_64
@@ -10,10 +10,7 @@ BootstrapPackageRepository HaikuPortsCross
 	gcc_bootstrap_syslibs_devel-4.8.3_2014_08_03-1
 	:
 	# repository architecture packages (stage 1)
-	autoconf_bootstrap-2.69-2
-	automake_bootstrap-1.13.1-1
-	libtool_cross_generic-2.4
-	bash_bootstrap-4.3.27-2
+	bash_bootstrap-4.3.30-1
 	binutils_bootstrap-2.24_2014_03_19-1
 	bison_bootstrap-2.4.3-1
 	curl_bootstrap-7.26.0-1
@@ -27,8 +24,6 @@ BootstrapPackageRepository HaikuPortsCross
 	icu_bootstrap-54.1-1
 	icu_bootstrap_devel-54.1-1
 	less_bootstrap-451-1
-	libtool_bootstrap-2.4-8
-	libtool_bootstrap_libltdl-2.4-8
 	m4_bootstrap-1.4.16-1
 	make_bootstrap-3.82-1
 	ncurses_bootstrap-5.9-1
@@ -45,8 +40,6 @@ BootstrapPackageRepository HaikuPortsCross
 
 	:
 	# source packages
-	autoconf_bootstrap
-	automake_bootstrap
 	bash_bootstrap
 	binutils_bootstrap
 	bison_bootstrap
@@ -59,7 +52,6 @@ BootstrapPackageRepository HaikuPortsCross
 	grep_bootstrap
 	less_bootstrap
 	libsolv_bootstrap
-	libtool_bootstrap
 	m4_bootstrap
 	make_bootstrap
 	ncurses_bootstrap