i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Removed debug output accidentally committed.

Browse Source 
* Also allow yasm 0.7.{0,1} -- they have been reported to successfully build
  at least.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30152 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2009-04-14 00:07:31 +00:00
parent 81f87f58ed
commit 92696166d0
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure
Vendored
+3 -4
View File
@@ -386,7 +386,7 @@ esac
# check yasm version # check yasm version
if [ $targetArch = "x86" ]; then if [ $targetArch = "x86" ]; then
$HAIKU_YASM --version > /dev/null || { $HAIKU_YASM --version > /dev/null || {
echo "The yasm assembler version 0.7.2 or later must be installed." echo "The yasm assembler version 0.7.0 or later must be installed."
echo "Download from: http://www.tortall.net/projects/yasm/wiki/Download" echo "Download from: http://www.tortall.net/projects/yasm/wiki/Download"
exit 1 exit 1
} }
@@ -394,13 +394,12 @@ if [ $targetArch = "x86" ]; then
set -- $($HAIKU_YASM --version | head -n 1) set -- $($HAIKU_YASM --version | head -n 1)
versionOK=0 versionOK=0
case $2 in case $2 in
0.[0-6].*) echo match1;; 0.[0-6].*) ;;
0.7.[0-1].*) echo match2;;
*) versionOK=1 ;; *) versionOK=1 ;;
esac esac
if [ $versionOK = 0 ]; then if [ $versionOK = 0 ]; then
echo "The yasm assembler version 0.7.2 or later must be installed." echo "The yasm assembler version 0.7.0 or later must be installed."
echo "The installed version is $2." echo "The installed version is $2."
echo "Download from: http://www.tortall.net/projects/yasm/wiki/Download" echo "Download from: http://www.tortall.net/projects/yasm/wiki/Download"
exit 1 exit 1