[coreboot] [commit] r5108 - in trunk: . src/arch/i386 util/abuild

[repository service]

Author: oxygene
Date: Wed Feb 10 19:08:22 2010
New Revision: 5108
URL: http://tracker.coreboot.org/trac/coreboot/changeset/5108

Log:
Remove two perl calls with sed, and adds an alternative
for another two (using GNU date, and with limited impact if both
alternatives fail)

Those were the remaining perl calls in our build tree, so remove perl
from our dependency list in README.


Signed-off-by: Patrick Georgi <patrick.georgi at coresystems.de>
Acked-by: Stefan Reinauer <stepan at coresystems.de>

Modified:
   trunk/README
   trunk/src/arch/i386/Makefile.inc
   trunk/util/abuild/abuild

Modified: trunk/README
==============================================================================
--- trunk/README	Wed Feb 10 16:36:53 2010	(r5107)
+++ trunk/README	Wed Feb 10 19:08:22 2010	(r5108)
@@ -35,7 +35,6 @@
  * gcc / g++
  * make
  * python
- * perl
 
 Optional:
 

Modified: trunk/src/arch/i386/Makefile.inc
==============================================================================
--- trunk/src/arch/i386/Makefile.inc	Wed Feb 10 16:36:53 2010	(r5107)
+++ trunk/src/arch/i386/Makefile.inc	Wed Feb 10 19:08:22 2010	(r5108)
@@ -83,9 +83,8 @@
 
 else
 $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(OPTION_TABLE_H) $(obj)/build.h
-	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $< -o $@
-	perl -e 's/\.rodata/.rom.data/g' -pi $@
-	perl -e 's/\.text/.section .rom.text/g' -pi $@
+	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $< -o - | sed -e 's/\.rodata/.rom.data/g' -e 's/\.text/.section .rom.text/g' > $@.tmp
+	mv $@.tmp $@
 endif
 endif
 

Modified: trunk/util/abuild/abuild
==============================================================================
--- trunk/util/abuild/abuild	Wed Feb 10 16:36:53 2010	(r5107)
+++ trunk/util/abuild/abuild	Wed Feb 10 19:08:22 2010	(r5108)
@@ -216,7 +216,7 @@
 	test 0$cpus -gt 1 && printf "on %d cpus in parallel .. " $cpus
 
 	CURR=$( pwd )
-	stime=`perl -e 'print time();'`
+	stime=`perl -e 'print time();' 2>/dev/null || date +%s`
 	build_dir=$TARGET/${VENDOR}_${MAINBOARD}
 	eval $MAKE $silent -j $cpus obj=${build_dir} \
 		&> ${build_dir}/make.log
@@ -225,7 +225,7 @@
 	mv .xcompile ${build_dir}/xcompile.build
 	mv ..config.tmp ${build_dir}/config.deps
 	cd $TARGET/${VENDOR}_${MAINBOARD}
-	etime=`perl -e 'print time();'`
+	etime=`perl -e 'print time();' 2>/dev/null || date +%s`
 	duration=$(( $etime - $stime ))
 	if [ $ret -eq 0 ]; then
 		xml "  <compile>ok</compile>"