[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ipcop-svn
Subject:    [Ipcop-svn] SF.net SVN: ipcop: [370] ipcop/trunk/make.sh
From:       gespinasse () users ! sourceforge ! net
Date:       2007-05-28 9:39:42
Message-ID: E1HsbhW-0003kA-Lu () sc8-pr-svn4 ! sourceforge ! net
[Download RAW message or body]

Revision: 370
          http://ipcop.svn.sourceforge.net/ipcop/?rev=370&view=rev
Author:   gespinasse
Date:     2007-05-28 02:39:42 -0700 (Mon, 28 May 2007)

Log Message:
-----------
During awk detection, use a syntax compatible with mawk and GNU awk

Add check_toolchain_prerequisites before attempting to build the toolchain

Modified Paths:
--------------
    ipcop/trunk/make.sh

Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh	2007-05-27 21:42:19 UTC (rev 369)
+++ ipcop/trunk/make.sh	2007-05-28 09:39:42 UTC (rev 370)
@@ -683,12 +683,12 @@
 		exiterror "GNU Findutils not found!"
 	fi
 
-	# Check for gawk
-	echo -ne "Checking for GNU Awk" | tee -a $LOGFILE
-	if awk --version | grep -qEi 'GNU Awk' ; then
+	# Check for awk (sarge use mawk and not GNU Awk)
+	echo -ne "Checking for Gnu awk or mawk" | tee -a $LOGFILE
+	if awk -W version 2>&1 | grep -qEi 'awk' ; then
 		beautify message DONE
 	else
-		exiterror "GNU Awk not found"
+		exiterror "awk not found"
 	fi
 
 	# Check for gcc
@@ -1883,6 +1883,8 @@
 	;;
 toolchain)
 	prepareenv
+	# Check if host can build the toolchain
+	check_toolchain_prerequisites
 	toolchain_build
 	echo "Create toolchain tar.gz for $MACHINE" | tee -a $LOGFILE
 	# Safer inside the chroot


This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.

-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn


[prev in list] [next in list] [prev in thread] [next in thread]