From 3b0f898d87c933c93bf70c58997e8953277a845a Mon Sep 17 00:00:00 2001
From: NagaJyothi Eggone <nagajyothi.eggone@amd.com>
Date: Fri, 2 Nov 2012 17:47:39 +0530
Subject: [PATCH] go.sh scripts of several benchmarks modified to pick up $CC,
 $CFLAGS, $CXXFLAGS, etc consistently.

---
 apache/go.sh          |  2 +-
 compress-lzma/go.sh   |  2 +-
 encode-ape/go.sh      |  2 +-
 encode-flac/go.sh     |  4 ++--
 encode-mp3/go.sh      |  4 ++--
 encode-ogg/go.sh      |  8 ++++----
 encode-wavpack/go.sh  |  4 ++--
 gcrypt/go.sh          |  4 ++--
 gmpbench/go.sh        |  2 +-
 gnupg/go.sh           |  2 +-
 graphics-magick/go.sh |  4 ++--
 hmmer/go.sh           |  2 +-
 mencoder/go.sh        | 12 +++++++++---
 minion/go.sh          |  2 ++
 nero2d/go.sh          |  2 +-
 nginx/go.sh           | 10 +++++-----
 pgbench/go.sh         |  4 ++--
 phpbench/go.sh        |  4 ++--
 povray/go.sh          |  2 +-
 sudokut/go.sh         |  2 +-
 systester/go.sh       |  5 +++--
 x264/go.sh            |  5 +++--
 22 files changed, 49 insertions(+), 39 deletions(-)

diff --git a/apache/go.sh b/apache/go.sh
index dfc80f6..c4337aa 100755
--- a/apache/go.sh
+++ b/apache/go.sh
@@ -18,7 +18,7 @@ tar -zxf httpd-2.2.17.tar.gz
 mkdir -p usr
 cd httpd-2.2.17
 ./configure --prefix=$p/usr
-make -j $procs CFLAGS="$CFLAGS"
+make -j $procs CFLAGS="$CFLAGS -DHAVE_EXPAT_CONFIG_H"
 make install
 cd $p
 cp test.html usr/htdocs/
diff --git a/compress-lzma/go.sh b/compress-lzma/go.sh
index 6819007..c744340 100755
--- a/compress-lzma/go.sh
+++ b/compress-lzma/go.sh
@@ -17,7 +17,7 @@ rm -rf lzma-4.32.6 usr
 tar -zxf lzma-4.32.6.tar.gz
 cd lzma-4.32.6
 ./configure --prefix=$p/usr
-make -j $procs CFLAGS="$CFLAGS"
+make -j $procs CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS"
 make install
 cd $p
 echo "Copy 256M from /dev/urandom." > $p/log
diff --git a/encode-ape/go.sh b/encode-ape/go.sh
index 4f2f297..25038fa 100755
--- a/encode-ape/go.sh
+++ b/encode-ape/go.sh
@@ -22,7 +22,7 @@ make -j $procs
 make install
 cd $p
 before=`date +%s.%N`
-$p/usr/bin/mac $p/../extra/pts-trondheim.wav /dev/null -c4000 > /dev/null 2>&1
+$p/usr/bin/mac $p/../extra/pts-trondheim-3.wav /dev/null -c4000 > /dev/null 2>&1
 after=`date +%s.%N`
 echo "encode-ape run time: `echo "$after - $before" | bc`" > $p/log
 rm -rf $p/usr $p/mac-3.99-u4-b5-s6
diff --git a/encode-flac/go.sh b/encode-flac/go.sh
index eae1e3e..ea649ab 100755
--- a/encode-flac/go.sh
+++ b/encode-flac/go.sh
@@ -31,10 +31,10 @@ diff -Naur flac-1.2.1-orig/examples/cpp/encode/file/main.cpp flac-1.2.1/examples
 EOF
 cd flac-1.2.1
 ./configure --prefix=$p/usr
-make -j $procs
+make -j $procs CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS"
 make install
 before=`date +%s.%N`
-$p/usr/bin/flac -s --best --totally-silent $p/../extra/pts-trondheim.wav -f -o /dev/null 2>&1
+$p/usr/bin/flac -s --best --totally-silent $p/../extra/pts-trondheim-3.wav -f -o /dev/null 2>&1
 after=`date +%s.%N`
 echo "encode-flac run time: `echo "$after - $before" | bc`" > $p/log
 cd $p; rm -rf usr flac-1.2.1
diff --git a/encode-mp3/go.sh b/encode-mp3/go.sh
index e5af0d6..74440ca 100755
--- a/encode-mp3/go.sh
+++ b/encode-mp3/go.sh
@@ -18,10 +18,10 @@ mkdir -p usr
 tar -zxf lame-398-2.tar.gz
 cd lame-398-2
 ./configure --prefix=$p/usr
-make -j $procs
+make -j $procs CFLAGS="$CFLAGS"
 make install
 before=`date +%s.%N`
-$p/usr/bin/lame -h $p/../extra/pts-trondheim.wav /dev/null 2>&1
+$p/usr/bin/lame -h $p/../extra/pts-trondheim-3.wav /dev/null 2>&1
 after=`date +%s.%N`
 echo "encode-mp3 run time: `echo "$after - $before" | bc`" > $p/log
 cd $p; rm -rf usr lame-398-2
diff --git a/encode-ogg/go.sh b/encode-ogg/go.sh
index 3b51059..32d3ab1 100755
--- a/encode-ogg/go.sh
+++ b/encode-ogg/go.sh
@@ -20,18 +20,18 @@ tar -zxf libvorbis-1.2.0.tar.gz
 tar -zxf vorbis-tools-1.2.0.tar.gz
 cd libogg-1.1.3
 ./configure --prefix=$p/usr
-make -j $procs
+make -j $procs CFLAGS="$CFLAGS"
 make install
 cd ../libvorbis-1.2.0
 ./configure --prefix=$p/usr
-make -j $procs
+make -j $procs CFLAGS="$CFLAGS"
 make install
 cd ../vorbis-tools-1.2.0/
 ./configure --prefix=$p/usr
-make -j $procs
+make -j $procs CFLAGS="$CFLAGS"
 make install
 before=`date +%s.%N`
-$p/usr/bin/oggenc $p/../extra/pts-trondheim.wav -q 10 -o /dev/null > /dev/null 2>&1
+$p/usr/bin/oggenc $p/../extra/pts-trondheim-3.wav -q 10 -o /dev/null > /dev/null 2>&1
 after=`date +%s.%N`
 echo "encode-ogg run time: `echo "$after - $before" | bc`" > $p/log
 cd $p; rm -rf usr libogg-1.1.3 libvorbis-1.2.0 vorbis-tools-1.2.0
diff --git a/encode-wavpack/go.sh b/encode-wavpack/go.sh
index 48cdc7c..59dc254 100755
--- a/encode-wavpack/go.sh
+++ b/encode-wavpack/go.sh
@@ -18,10 +18,10 @@ mkdir -p usr
 tar -jxf wavpack-4.41.0.tar.bz2
 cd wavpack-4.41.0
 ./configure --prefix=$p/usr
-make -j $procs
+make -j $procs CFLAGS="$CFLAGS"
 make install
 before=`date +%s.%N`
-$p/usr/bin/wavpack -q -r -hhx2 -o - $p/../extra/pts-trondheim.wav > /dev/null 2>&1
+$p/usr/bin/wavpack -q -r -hhx2 -o - $p/../extra/pts-trondheim-3.wav > /dev/null 2>&1
 after=`date +%s.%N`
 echo "encode-wavpack run time: `echo "$after - $before" | bc`" > $p/log
 cd $p; rm -rf usr wavpack-4.41.0
diff --git a/gcrypt/go.sh b/gcrypt/go.sh
index 1a39492..f725ef6 100755
--- a/gcrypt/go.sh
+++ b/gcrypt/go.sh
@@ -19,11 +19,11 @@ tar -jxf libgpg-error-1.7.tar.bz2
 tar -jxf libgcrypt-1.4.4.tar.bz2
 cd libgpg-error-1.7
 ./configure --prefix=$p/usr
-make -j $procs
+make -j $procs CFLAGS="$CFLAGS"
 make install
 cd ../libgcrypt-1.4.4
 ./configure --with-gpg-error-prefix=$p/usr
-make -j $procs
+make -j $procs CFLAGS="$CFLAGS"
 before=`date +%s.%N`
 $p/libgcrypt-1.4.4/tests/benchmark --cipher-repetition 100 cipher camellia256 > $p/log 2>&1
 after=`date +%s.%N`
diff --git a/gmpbench/go.sh b/gmpbench/go.sh
index 2ccd5c7..d2fc1d9 100755
--- a/gmpbench/go.sh
+++ b/gmpbench/go.sh
@@ -21,7 +21,7 @@ tar -zxvf gmpbench-0.1.tar.gz
 cp gexpr.c gmpbench-0.1
 cd gmp-4.3.0/
 ./configure --prefix=$p/usr
-make -j $procs
+make -j $procs CFLAGS="$CFLAGS"
 make install
 cp $p/usr/include/gmp.h $p/gmpbench-0.1/
 cd ../gmpbench-0.1/
diff --git a/gnupg/go.sh b/gnupg/go.sh
index 63fa547..1268147 100755
--- a/gnupg/go.sh
+++ b/gnupg/go.sh
@@ -18,7 +18,7 @@ mkdir -p usr
 tar -zxvf gnupg-1.4.10.tar.gz
 cd gnupg-1.4.10/
 ./configure --prefix=$p/usr
-make -j $procs
+make -j $procs CFLAGS="$CFLAGS"
 make install
 echo pts-1234567890 > passphrase
 dd if=/dev/zero of=encryptfile bs=1M count=1024
diff --git a/graphics-magick/go.sh b/graphics-magick/go.sh
index 3278e89..eb9c9fb 100755
--- a/graphics-magick/go.sh
+++ b/graphics-magick/go.sh
@@ -19,11 +19,11 @@ tar -zxf libpng-1.2.39.tar.gz
 tar -jxf GraphicsMagick-1.3.12.tar.bz2
 cd libpng-1.2.39
 ./configure --prefix=$p/usr/
-make -j $procs
+make -j $procs CFLAGS="$CFLAGS"
 make install
 cd ../GraphicsMagick-1.3.12
 LDFLAGS="-L$p/usr/lib" CPPFLAGS="-I$p/usr/include" ./configure --without-perl --prefix=$p/usr --with-png=yes
-make -j $procs
+make -j $procs CFLAGS="$CFLAGS"
 make install
 > $p/log
 before=`date +%s.%N`
diff --git a/hmmer/go.sh b/hmmer/go.sh
index 5f24b54..414edbf 100755
--- a/hmmer/go.sh
+++ b/hmmer/go.sh
@@ -18,7 +18,7 @@ mkdir -p usr
 tar -zxvf hmmer-2.3.2.tar.gz
 cd hmmer-2.3.2
 ./configure --enable-threads --prefix=$p/usr
-make -j $procs
+make -j $procs CFLAGS="$CFLAGS"
 make install
 cp -r $p/hmmer-2.3.2/tutorial $p/usr
 gunzip $p/Pfam_ls.gz -c > $p/usr/tutorial/Pfam_ls
diff --git a/mencoder/go.sh b/mencoder/go.sh
index b4197dd..3f2240c 100755
--- a/mencoder/go.sh
+++ b/mencoder/go.sh
@@ -21,11 +21,17 @@ patch -p1 < ../patches/mplayer-vaapi.patch
 patch -p1 < ../patches/mplayer-vaapi-gma500-workaround.patch
 patch -p1 < ../patches/mplayer-vaapi-0.29.patch
 patch -p1 < ../patches/mplayer-vdpau.patch
-./configure --enable-xv --enable-xvmc --disable-vaapi --disable-vdpau --disable-ivtv --prefix=$p/usr
+#./configure --enable-xv --enable-xvmc --disable-vaapi --disable-vdpau --disable-ivtv --prefix=$p/usr
+./configure --cc="$CC" --host-cc="$CC" --extra-cflags="$CFLAGS" --enable-xv --enable-xvmc --disable-vaapi --disable-vdpau --disable-ivtv --prefix=$p/usr
 make -j $procs
 make install
+#Max. number of threads can be 8 for mencoder
+mprocs=$procs
+if (($mprocs > 8))
+then mprocs=8
+fi
 before=`date +%s.%N`
-$p/usr/bin/mencoder $p/../extra/pts-trondheim.avi -o /dev/null -ovc lavc -oac copy -lavcopts vcodec=mpeg4:threads=$procs:mbd=2:trell=1:v4mv=1:vstrict=1
+$p/usr/bin/mencoder $p/../extra/pts-trondheim.avi -o /dev/null -ovc lavc -oac copy -lavcopts vcodec=mpeg4:threads=$mprocs:mbd=2:trell=1:v4mv=1:vstrict=1
 after=`date +%s.%N`
-echo "mencoder run time: `echo "$after - $before" | bc`" >> $p/log
+echo "mencoder run time: `echo "$after - $before" | bc`" > $p/log
 cd $p; rm -rf usr mplayer-vaapi-20100602
diff --git a/minion/go.sh b/minion/go.sh
index 16d6aea..0033694 100755
--- a/minion/go.sh
+++ b/minion/go.sh
@@ -18,7 +18,9 @@ tar -zxf minion-0.9-src.tar.gz
 cd minion-0.9
 mkdir build
 cd build
+CPU=""
 cmake -DQUICK=1 ..
+make clean
 make minion -j $procs CXX_FLAGS="$CXXFLAGS" CXX="$CXX"
 > $p/log
 before=`date +%s.%N`
diff --git a/nero2d/go.sh b/nero2d/go.sh
index 713a4de..5009bb5 100755
--- a/nero2d/go.sh
+++ b/nero2d/go.sh
@@ -33,7 +33,7 @@ EOT
 
 cd nero2d-2.0.2/
 ./configure --prefix=$p/usr
-make -j $procs
+make -j $procs CXXFLAGS="$CXXFLAGS" CFLAGS="$CFLAGS"
 make install
 before=`date +%s.%N`
 $p/usr/bin/nero2d $p/usr/share/examples/example2/example2.igf > /dev/null 2>&1
diff --git a/nginx/go.sh b/nginx/go.sh
index b39f757..05cea75 100755
--- a/nginx/go.sh
+++ b/nginx/go.sh
@@ -21,18 +21,18 @@ tar -zxf httpd-2.2.11.tar.gz
 cd httpd-2.2.11/
 ./configure --prefix=$p/usr --enable-static-ab --without-http-cache
 cd srclib/apr
-make -j $procs
+make -j $procs CFLAGS="$CFLAGS"
 cd ../apr-util
-make -j $procs
+make -j $procs CFLAGS="$CFLAGS"
 cd ../pcre
-make -j $procs
+make -j $procs CFLAGS="$CFLAGS"
 cd ../../support
-make ab -j $procs
+make ab -j $procs CFLAGS="$CFLAGS"
 cd ../..
 cp -av httpd-2.2.11/support/ab $p/usr
 cd nginx-0.8.53/
 ./configure --prefix=$p/usr --without-http_rewrite_module --without-http-cache
-make -j $procs
+make -j $procs CFLAGS="$CFLAGS"
 make install
 cd ..
 
diff --git a/pgbench/go.sh b/pgbench/go.sh
index 2e050ea..8e50f4d 100755
--- a/pgbench/go.sh
+++ b/pgbench/go.sh
@@ -23,7 +23,7 @@ sed -i -e 's/__FAST_MATH__/foo_bar/g' $p/postgresql-9.0.1/src/interfaces/ecpg/pg
 sed -i -e 's/__FAST_MATH__/foo_bar/g' $p/postgresql-9.0.1/src/interfaces/ecpg/pgtypeslib/timestamp.c
 cd postgresql-9.0.1
 ./configure --prefix=$p/usr --datadir=$p/usr/data --without-readline --without-zlib
-make -j $procs
+make -j $procs CFLAGS="$CFLAGS"
 make -C contrib/pgbench all
 make install
 make -C contrib/pgbench install
@@ -41,4 +41,4 @@ after=`date +%s.%N`
 echo "pgbench run time: `echo "$after - $before" | bc`" >> $p/log
 $p/usr/bin/dropdb pgbench
 $p/usr/bin/pg_ctl stop
-cd $p; rm -rf usr postgresql-9.0.1
\ No newline at end of file
+cd $p; rm -rf usr postgresql-9.0.1
diff --git a/phpbench/go.sh b/phpbench/go.sh
index 267b66a..7152532 100755
--- a/phpbench/go.sh
+++ b/phpbench/go.sh
@@ -20,11 +20,11 @@ tar -jxf php-5.2.9.tar.bz2
 tar -zxf phpbench-0.8.1.tar.gz
 cd $p/libxml2-2.6.31
 ./configure --prefix=$p/usr
-make -j $procs
+make -j $procs CFLAGS="$CFLAGS"
 make install
 cd $p/php-5.2.9
 ./configure --with-libxml-dir=$p/usr --prefix=$p/usr
-make -j $procs
+make -j $procs CFLAGS="$CFLAGS"
 make install
 cd $p/phpbench-0.8.1
 before=`date +%s.%N`
diff --git a/povray/go.sh b/povray/go.sh
index ca1a7a7..909b184 100755
--- a/povray/go.sh
+++ b/povray/go.sh
@@ -18,7 +18,7 @@ tar -jxf povray-3.6.1.tar.bz2
 mkdir -p usr
 cd povray-3.6.1/
 ./configure --prefix=$p/usr COMPILED_BY="PhoronixTestSuite"
-make -j $procs
+make -j $procs CFLAGS="$CFLAGS"
 make install
 before=`date +%s.%N`
 echo 1 | $p/usr/bin/povray -benchmark > $p/log 2>&1
diff --git a/sudokut/go.sh b/sudokut/go.sh
index 6ad0453..7860a01 100755
--- a/sudokut/go.sh
+++ b/sudokut/go.sh
@@ -19,7 +19,7 @@ tar -zxf bash-4.2.tar.gz
 tar -jxf sudokut0.4-1.tar.bz2
 cd $p/bash-4.2
 ./configure --prefix=$p/usr/
-make -j $procs
+make -j $procs CFLAGS="$CFLAGS"
 make install
 cd $p/sudokut0.4/
 sed -i -e "s|/bin/bash|$p/usr/bin/bash|g" $p/sudokut0.4/sudokut
diff --git a/systester/go.sh b/systester/go.sh
index 5ebe8c6..71ea16e 100755
--- a/systester/go.sh
+++ b/systester/go.sh
@@ -16,11 +16,12 @@ p=`pwd`
 rm -rf systester-1.1.0-src
 tar -jxf systester-1.1.0-src.tar.bz2
 cd systester-1.1.0-src
-make -j $procs -C $p/systester-1.1.0-src/cli CFLAGS="-O2 -pipe -Wall -W -D_REENTRANT -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED" CXXFLAGS="-O2 -pipe -Wall -W -D_REENTRANT -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED"
+sed -i -e "s/cc/$CC/g" cli/Makefile
+make -j $procs -C $p/systester-1.1.0-src/cli CFLAGS="-O2 -pipe -Wall -W -D_REENTRANT -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED $CFLAGS" CXXFLAGS="-O2 -pipe -Wall -W -D_REENTRANT -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED $CXXFLAGS"
 before=`date +%s.%N`
 for arg in {"-gausslg","-qcborwein"}; do
     $p/systester-1.1.0-src/cli/systester-cli -bench $arg 4M -threads $procs > $p/log 2>&1
 done
 after=`date +%s.%N`
 echo "systester run time: `echo "$after - $before" | bc`" >> $p/log
-cd $p; rm -rf systester-1.1.0-src
\ No newline at end of file
+cd $p; rm -rf systester-1.1.0-src
diff --git a/x264/go.sh b/x264/go.sh
index 71a65d5..9615509 100755
--- a/x264/go.sh
+++ b/x264/go.sh
@@ -19,8 +19,9 @@ tar -xjf x264-snapshot-20101122-2245.tar.bz2
 cd x264-snapshot-20101122-2245
 sed -i -e 's/-O3 -ffast-math//g' configure
 sed -i -e 's/CFLAGS -fno-tree-vectorize/CFLAGS/g' configure
-./configure --prefix=$p/usr
-make -j $procs
+#./configure --prefix=$p/usr
+./configure --prefix=$p/usr --disable-asm
+make -j $procs CFLAGS="$CFLAGS -I. -std=gnu99"
 make install
 before=`date +%s.%N`
 $p/usr/bin/x264 -o /dev/null --threads $procs $p/../extra/soccer_4cif.y4m > $p/log 2>&1
-- 
2.11.4.GIT