From acb6c8b7f1a4a517f286f1be903431233fd4b1d7 Mon Sep 17 00:00:00 2001 From: Vijay Mahendran Date: Tue, 7 Apr 2009 05:52:24 +0000 Subject: [PATCH] Changes for blr. --- CASA-auth-token/client/build_config/linux/autobuild | 9 ++++++++- CASA-auth-token/client/build_config/win64/builduser.cmd | 2 +- .../client/package/linux/CASA_auth_token_client.spec.in | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CASA-auth-token/client/build_config/linux/autobuild b/CASA-auth-token/client/build_config/linux/autobuild index 2e1255c4..d5416bf5 100755 --- a/CASA-auth-token/client/build_config/linux/autobuild +++ b/CASA-auth-token/client/build_config/linux/autobuild @@ -52,7 +52,14 @@ cd $TEMP_DIR ##call autobuild . /opt/SuSE/bin/.profile -sudo build --clean +ARCH=`uname -m` +case $ARCH in i386|i586|i686) + sudo build --clean + ;; + x86_64) + build --clean + ;; +esac ##copy rpms to temp directoy cp -rf $RPMS_DIR/RPMS $TEMP_DIR diff --git a/CASA-auth-token/client/build_config/win64/builduser.cmd b/CASA-auth-token/client/build_config/win64/builduser.cmd index e9e97465..52f24fe3 100755 --- a/CASA-auth-token/client/build_config/win64/builduser.cmd +++ b/CASA-auth-token/client/build_config/win64/builduser.cmd @@ -5,7 +5,7 @@ rem setlocal set casa_root_dir=%cd% rem Do a free (retail) build setlocal -call "C:\Program Files (x86)\Microsoft Visual Studio 2005\VC\bin\amd64\vcvarsamd64.bat" +call "F:\Program Files\Microsoft Visual Studio 8\VC\bin\amd64\vcvarsamd64.bat" rem VS 2005 crashed when building solution file, so right now building project level. rem Also, it has the same problem with rebuild option, so I am cleaning binaries in my scripts. diff --git a/CASA-auth-token/client/package/linux/CASA_auth_token_client.spec.in b/CASA-auth-token/client/package/linux/CASA_auth_token_client.spec.in index ee906c56..df8a24c3 100644 --- a/CASA-auth-token/client/package/linux/CASA_auth_token_client.spec.in +++ b/CASA-auth-token/client/package/linux/CASA_auth_token_client.spec.in @@ -15,7 +15,7 @@ Name: CASA_auth_token_client %define debug_opt "" Url: http://www.novell.com/products -BuildRequires: CASA-devel curl-devel expat gcc-c++ glade-sharp2 glib2-devel krb5-devel libgcc libgssapi libopenssl-devel libstdc++ libstdc++-devel mono-devel pkgconfig update-alternatives +BuildRequires: CASA-devel curl-devel expat gcc-c++ glade-sharp2 glib2-devel krb5-devel libgcc libgssapi openssl-devel libstdc++ libstdc++-devel mono-devel pkgconfig update-alternatives %if %suse_version > 1020 BuildRequires: libexpat-devel %endif