[SCM] Samba Shared Repository - branch v3-3-test updated -
release-3-2-0pre2-5258-gb2205a7
Karolin Seeger
kseeger at samba.org
Wed May 13 08:17:08 GMT 2009
The branch, v3-3-test has been updated
via b2205a7697598729f85cb767621b8c610654053c (commit)
from a0e9521b306a7e83d09de4616a66b49d259f0bbc (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit b2205a7697598729f85cb767621b8c610654053c
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)
-----------------------------------------------------------------------
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 d3724d9..7818296 100644
--- a/packaging/RHEL/samba.spec.tmpl
+++ b/packaging/RHEL/samba.spec.tmpl
@@ -122,8 +122,7 @@ cd source
# 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