[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1209-g174356c

Karolin Seeger kseeger at samba.org
Wed Aug 12 08:43:22 MDT 2009


The branch, v3-4-test has been updated
       via  174356c6618f8704b968ccfb46b04233bf7dfa40 (commit)
      from  c704e22806198a620d7e058c8d69c144ce096837 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit 174356c6618f8704b968ccfb46b04233bf7dfa40
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed May 13 10:07:56 2009 +0200

    s3/packaging: Fix build on RHEL when ccache is not available.
    
    This fixes bug #5832.
    Patch was provided by D.L. Meyer <dlmeyer [at] uiuc.edu>.
    
    Thanks for reporting and providing the patch!
    
    Karolin
    (cherry picked from commit 42e0cb8c0a1b8470ac8e9ad1c5a741e299debb8f)
    (cherry picked from commit b2205a7697598729f85cb767621b8c610654053c)

-----------------------------------------------------------------------

Summary of changes:
 packaging/RHEL/samba.spec.tmpl |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index eb85f9c..4467963 100644
--- a/packaging/RHEL/samba.spec.tmpl
+++ b/packaging/RHEL/samba.spec.tmpl
@@ -122,8 +122,7 @@ cd source3
 # RPM_OPT_FLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64"
 
 ## check for ccache
- ccache -h 2>&1 > /dev/null
-if [ $? -eq 0 ]; then
+if [ "$(which ccache 2> /dev/null)" != "" ]; then
 	CC="ccache gcc"
 else
 	CC="gcc"


-- 
Samba Shared Repository


More information about the samba-cvs mailing list