[SCM] Samba Shared Repository - branch master updated
Björn Jacke
bjacke at samba.org
Sun May 30 08:25:38 MDT 2010
The branch, master has been updated
via a1b44f4... s3: set pthread cflags in a more portable fashion
via 30c74cf... Revert "s3: Attempt to fix the non-gnumake build"
via 96ee956... s3: fix check for pie compiler flags
via b869350... s3: add m4 macro to check if stderr is empty or not
from 55df760... Revert "s4:rpc_server/dcesrv_auth.c - Fix a RPC issue in conjunction with Windows 2000"
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit a1b44f4335f41a0c11505f1552d9173ca0b469f4
Author: Björn Jacke <bj at sernet.de>
Date: Sat May 29 02:06:56 2010 +0200
s3: set pthread cflags in a more portable fashion
this avoids one place of a GNU make dependency.
Portable make sucks a bit as it has no way of defining variables for a limited
set of targets only. Manual duplication of target rules is the only way to
achieve what we need.
If someone actually knows a trick how to do this without target duplication,
let me know.
commit 30c74cfa4995af57d8ec3f0f9d3f515e0b285beb
Author: Björn Jacke <bj at sernet.de>
Date: Sat May 29 02:02:20 2010 +0200
Revert "s3: Attempt to fix the non-gnumake build"
This reverts commit 086c6c0e9a56f7e6dca6c1398e210b8c6225e4ed, it broke some
builds. The following commit should also remove the gmake dependency.
commit 96ee9568eddf1a2f80ed5beb916ad00b1e2710bd
Author: Björn Jacke <bj at sernet.de>
Date: Sat May 29 01:40:21 2010 +0200
s3: fix check for pie compiler flags
some compilers (HP and Sun e.g.) output warning messages on stderr for unknown
options and we ended up partly using some unwanted random compile flags we
did't intend to use.
commit b869350ddda84d0d6953339843bebd25d18b8fba
Author: Björn Jacke <bj at sernet.de>
Date: Sat May 29 01:39:16 2010 +0200
s3: add m4 macro to check if stderr is empty or not
-----------------------------------------------------------------------
Summary of changes:
source3/Makefile.in | 38 +++++++++++++++++++++++++++++++++-----
source3/configure.in | 4 ++--
source3/m4/aclocal.m4 | 13 +++++++++++++
3 files changed, 48 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 671bd8e..f411eee 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1406,8 +1406,6 @@ wins : SHOWFLAGS @WINBIND_WINS_NSS@
modules:: SHOWFLAGS $(MODULES)
-$(LIBSMBCLIENT_THREAD_OBJ) ../nsswitch/wins.o \
- ../nsswitch/winbind_nss_linux.o := EXTRA_FLAGS = $(PTHREAD_CFLAGS)
#####################################################################
## Perl IDL Compiler
@@ -1467,11 +1465,11 @@ MAKEDIR = || exec false; \
exec false; fi || exec false
# Run a static checker.
-CHECK_CC = $(CC_CHECKER) $(CFLAGS) $(EXTRA_FLAGS) $(PICFLAG) -c $< -o $@
+CHECK_CC = $(CC_CHECKER) $(CFLAGS) $(PICFLAG) -c $< -o $@
# Compile a source file.
-COMPILE_CC = $(CC) $(CFLAGS) $(EXTRA_FLAGS) $(PICFLAG) -c $< -o $@
+COMPILE_CC = $(CC) $(CFLAGS) $(PICFLAG) -c $< -o $@
# Compile a source file with the installation paths defined.
-COMPILE_CC_PATH = $(CC) $(PATH_FLAGS) $(CFLAGS) $(EXTRA_FLAGS) $(PICFLAG) -c $< -o $@
+COMPILE_CC_PATH = $(CC) $(PATH_FLAGS) $(CFLAGS) $(PICFLAG) -c $< -o $@
COMPILE = $(COMPILE_CC)
@@ -1522,6 +1520,36 @@ dynconfig.o: dynconfig.c Makefile
echo "$(COMPILE_CC_PATH)" 1>&2;\
$(COMPILE_CC_PATH) >/dev/null 2>&1
+### Start section of object files that require PTHREAD_CFLAGS
+../nsswitch/wins.o: ../nsswitch/wins.c
+ @echo Compiling $*.c
+ @$(COMPILE) $(PTHREAD_CFLAGS) && exit 0;\
+ echo "The following command failed:" 1>&2;\
+ echo "$(COMPILE_CC) $(PTHREAD_CFLAGS)" 1>&2;\
+ $(COMPILE_CC) $(PTHREAD_CFLAGS) >/dev/null 2>&1
+
+../nsswitch/winbind_nss_linux.o: ../nsswitch/winbind_nss_linux.c
+ @echo Compiling $*.c
+ @$(COMPILE_CC) $(PTHREAD_CFLAGS) && exit 0;\
+ echo "The following command failed:" 1>&2;\
+ echo "$(COMPILE_CC) $(PTHREAD_CFLAGS)" 1>&2;\
+ $(COMPILE_CC) $(PTHREAD_CFLAGS) >/dev/null 2>&1
+
+libsmb/libsmb_thread_impl.o: libsmb/libsmb_thread_impl.c
+ @echo Compiling $*.c
+ @$(COMPILE) $(PTHREAD_CFLAGS) && exit 0;\
+ echo "The following command failed:" 1>&2;\
+ echo "$(COMPILE_CC) $(PTHREAD_CFLAGS)" 1>&2;\
+ $(COMPILE_CC) $(PTHREAD_CFLAGS) >/dev/null 2>&1
+
+libsmb/libsmb_thread_posix.o: libsmb/libsmb_thread_posix.c
+ @echo Compiling $*.c
+ @$(COMPILE) $(PTHREAD_CFLAGS) && exit 0;\
+ echo "The following command failed:" 1>&2;\
+ echo "$(COMPILE_CC) $(PTHREAD_CFLAGS)" 1>&2;\
+ $(COMPILE_CC) $(PTHREAD_CFLAGS) >/dev/null 2>&1
+### End section of object files that require PTHREAD_CFLAGS
+
localedir.o: localedir.c Makefile
@echo Compiling $*.c
@$(COMPILE_CC_PATH) && exit 0;\
diff --git a/source3/configure.in b/source3/configure.in
index 387e382..630421a 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -1498,9 +1498,9 @@ then
[
cat > conftest.c <<EOF
int foo;
-main () { return 0;}
+int main () { return 0;}
EOF
- if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -pie -fPIE -o conftest conftest.c 1>&AS_MESSAGE_LOG_FD])
+ if AC_TRY_COMMAND_NO_STDERR([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -pie -fPIE -o conftest conftest.c])
then
samba_cv_fpie=yes
else
diff --git a/source3/m4/aclocal.m4 b/source3/m4/aclocal.m4
index 7722487..f7f3497 100644
--- a/source3/m4/aclocal.m4
+++ b/source3/m4/aclocal.m4
@@ -609,6 +609,19 @@ AC_DEFUN([AC_DISABLE_STATIC],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
AC_ENABLE_STATIC(no)])
+dnl AC_TRY_COMMAND_NO_STDERR - also fail if there is output on stderr
+AC_DEFUN( [AC_TRY_COMMAND_NO_STDERR],
+[
+ { OUT=`($1) 3>&AS_MESSAGE_LOG_FD 2>&1 1>&3`
+ RC=$?
+ echo "\$?=$RC" >&AS_MESSAGE_LOG_FD
+ if test x"$OUT" != x ; then
+ echo "stderr:" >&AS_MESSAGE_LOG_FD
+ echo "$OUT" >&AS_MESSAGE_LOG_FD
+ fi
+ test $RC -eq 0 -a x"$OUT" = x ; }
+])
+
dnl AC_TRY_RUN_STRICT(PROGRAM,CFLAGS,CPPFLAGS,LDFLAGS,
dnl [ACTION-IF-TRUE],[ACTION-IF-FALSE],
dnl [ACTION-IF-CROSS-COMPILING = RUNTIME-ERROR])
--
Samba Shared Repository
More information about the samba-cvs
mailing list