Changeset 5108

Timestamp:

Feb 10, 2010 7:08:22 PM (3 years ago)

Author:

oxygene

Message:

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@…>
Acked-by: Stefan Reinauer <stepan@…>

Location:

trunk

Files:

• README (modified) (1 diff)
• src/arch/i386/Makefile.inc (modified) (1 diff)
• util/abuild/abuild (modified) (2 diffs)

trunk/README

@@ -36 +36 @@
  * make
  * python
- * perl
 
 Optional:

trunk/src/arch/i386/Makefile.inc

@@ -84 +84 @@
 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

trunk/util/abuild/abuild

@@ -217 +217 @@
 
         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} \
@@ -226 +226 @@
         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