From 9f9c3e0398ef70219a337b912e1c13465d043a5f Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Mon, 3 Sep 2007 09:47:21 +0000 Subject: [PATCH] Stefan Fiedler: expect: adapt for LFS build [2007082619163731282] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8706 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/public/expect/expect.conf | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/package/public/expect/expect.conf b/package/public/expect/expect.conf index 308beb0da..1410fe92e 100644 --- a/package/public/expect/expect.conf +++ b/package/public/expect/expect.conf @@ -1,4 +1,4 @@ - +#!/bin/bash # --- ROCK-COPYRIGHT-NOTE-BEGIN --- # # This copyright note is auto-generated by ./scripts/Create-CopyPatch. @@ -21,11 +21,20 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/base/tcl/tcl_config.sh +if [ "$ROCKCFG_CROSSBUILD" == 0 ] ; then +if [ $stagelevel == 2 ] ; then +custmain=expect_main + +expect_main() +{ + cp configure{,.bak} + sed 's:/usr/local/bin:/bin:' configure.bak > configure -hook_add preconf 1 'tcl_prepare_source tcl' -pkginstalled tk && hook_add preconf 1 'tcl_prepare_source tk' + ./configure --prefix=$tools --with-tcl=$tools/lib \ + --with-tclinclude=$tools/include --with-x=no -# make rebuilds configure (due to touching Makefile.in by fixdoc) -# with autoconf, which breaks it... -hook_add preconf 9 "touch configure" + make + make SCRIPTS="" install +} +fi +fi