From 68882a33220e802ef38d562ea1c96fd5fb779e49 Mon Sep 17 00:00:00 2001 From: Patrick Georgi <patrick.georgi@coresystems.de> Date: Wed, 10 Feb 2010 18:08:22 +0000 Subject: 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@coresystems.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5108 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- README | 1 - src/arch/i386/Makefile.inc | 5 ++--- util/abuild/abuild | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/README b/README index 81a3f14444..d7865b7b50 100644 --- a/README +++ b/README @@ -35,7 +35,6 @@ Build Requirements * gcc / g++ * make * python - * perl Optional: diff --git a/src/arch/i386/Makefile.inc b/src/arch/i386/Makefile.inc index db5171920c..f36f2db8ca 100644 --- a/src/arch/i386/Makefile.inc +++ b/src/arch/i386/Makefile.inc @@ -83,9 +83,8 @@ $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/ 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 diff --git a/util/abuild/abuild b/util/abuild/abuild index c905756edf..1942bf539a 100755 --- a/util/abuild/abuild +++ b/util/abuild/abuild @@ -216,7 +216,7 @@ function compile_target 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 @@ function compile_target 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>" -- cgit v1.2.3