[SCM] Samba Shared Repository - branch v3-5-test updated

Karolin Seeger kseeger at samba.org
Wed Jun 16 00:31:08 MDT 2010 

The branch, v3-5-test has been updated
       via  6c78aca... s3:build: remove CFLAGS from Solaris LDSHFLAGS, SHLD has them already
       via  85cbb1a... s3: final test for working shlib support requires PICFLAG
       via  87a0f21... s3: use autoconf macro to get some debug output in config.log
       via  e8468ab... s3: fix check for pie compiler flags
       via  6f2bf6c... s3: add m4 macro to check if stderr is empty or not
       via  8c4cdf3... s3:configure: add Werror_FLAGS for IBM's xlc
       via  634577b... s3:Makefile: add missing linker flags for smbfilter
       via  6a9aa4c... s3:Makefile: position independency is also needed for shared libs
       via  60ad93f... s3:build: don't use pieflags twice - ldflags already have them
      from  08c1c5f... s3:configure: turn "error warnings" into errors

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


- Log -----------------------------------------------------------------
commit 6c78aca691a9951a5a5c27e538df8c8376a74db1
Author: Björn Jacke <bj at sernet.de>
Date:   Wed May 12 19:05:37 2010 +0200

    s3:build: remove CFLAGS from Solaris LDSHFLAGS, SHLD has them already
    
    The last 9 patches address bug #7504 (numerous build glitches to be fixed).

commit 85cbb1a6b371e2282f0115e87e803c6fdc03c07c
Author: Björn Jacke <bj at sernet.de>
Date:   Mon May 31 00:26:01 2010 +0200

    s3: final test for working shlib support requires PICFLAG

commit 87a0f216eb6929e48b1c3c234426d29fdab38dc8
Author: Björn Jacke <bj at sernet.de>
Date:   Sun May 30 23:50:48 2010 +0200

    s3: use autoconf macro to get some debug output in config.log

commit e8468ab02b201885b6a211c4b27913014ee9a5a2
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 6f2bf6cf9d2b5ed3ca2992e26f442035764e0762
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

commit 8c4cdf30ae254b4c5ff9eff221529abc98855857
Author: Björn Jacke <bj at sernet.de>
Date:   Mon May 24 23:28:44 2010 +0200

    s3:configure: add Werror_FLAGS for IBM's xlc

commit 634577b29d8eea085c79e35d34d6e242a0a9f5a2
Author: Björn Jacke <bj at sernet.de>
Date:   Wed May 26 17:22:24 2010 +0200

    s3:Makefile: add missing linker flags for smbfilter
    
    this should fix the AIX build

commit 6a9aa4c2b3bebe06de97524a5c5ca577aaa3d14c
Author: Björn Jacke <bj at sernet.de>
Date:   Mon May 24 12:21:40 2010 +0200

    s3:Makefile: position independency is also needed for shared libs

commit 60ad93f074d83a65df080b85e43ea61722340a1c
Author: Björn Jacke <bj at sernet.de>
Date:   Sat May 22 16:48:16 2010 +0200

    s3:build: don't use pieflags twice - ldflags already have them

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

Summary of changes:
 source3/Makefile.in   |   14 +++++++-------
 source3/configure.in  |   36 ++++++++++++++++++++++++------------
 source3/m4/aclocal.m4 |   13 +++++++++++++
 3 files changed, 44 insertions(+), 19 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index f58bb70..6030a10 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -42,16 +42,16 @@ MODULE_EXPORTS=@MODULE_EXPORTS@
 DEVELOPER_CFLAGS=@DEVELOPER_CFLAGS@
 CFLAGS=@CFLAGS@
 CPPFLAGS=-DHAVE_CONFIG_H @CPPFLAGS@
+PICFLAG=@PICFLAG@
 
 EXEEXT=@EXEEXT@
 AR=@AR@
-LDSHFLAGS=@LDSHFLAGS@ @RELRO_LDFLAGS@ @LDFLAGS@ -lc @LDSHFLAGS_Z_DEFS@
-LDSHFLAGS_MODULES=@LDSHFLAGS@ @RELRO_LDFLAGS@ @LDFLAGS@ @LDSHFLAGS_Z_NODEFS@
+LDSHFLAGS=$(PICFLAG) @LDSHFLAGS@ @RELRO_LDFLAGS@ @LDFLAGS@ -lc @LDSHFLAGS_Z_DEFS@
+LDSHFLAGS_MODULES=$(PICFLAG) @LDSHFLAGS@ @RELRO_LDFLAGS@ @LDFLAGS@ @LDSHFLAGS_Z_NODEFS@
 LDFLAGS=@PIE_LDFLAGS@ @RELRO_LDFLAGS@ @LDFLAGS@
 
-WINBIND_NSS_LDSHFLAGS=@WINBIND_NSS_LDSHFLAGS@ @LDFLAGS@ -lc @LDSHFLAGS_Z_DEFS@
+WINBIND_NSS_LDSHFLAGS=$(PICFLAG) @WINBIND_NSS_LDSHFLAGS@ @LDFLAGS@ -lc @LDSHFLAGS_Z_DEFS@
 AWK=@AWK@
-PICFLAG=@PICFLAG@
 DYNEXP=@DYNEXP@
 PERL=@PERL@
 LIBDL=@LIBDL@
@@ -1681,12 +1681,12 @@ bin/talloctort at EXEEXT@: $(BINARY_PREREQS) $(TALLOCTORT_OBJ) @BUILD_POPT@ $(LIBTA
 
 bin/replacetort at EXEEXT@: $(REPLACETORT_OBJ) @BUILD_POPT@ $(LIBTALLOC)
 	@echo Linking $@
-	@$(CC) @PIE_LDFLAGS@ -o $@ $(REPLACETORT_OBJ) $(LDFLAGS) \
+	@$(CC) -o $@ $(REPLACETORT_OBJ) $(LDFLAGS) \
 		$(DYNEXP) $(LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS)
 
 bin/smbconftort at EXEEXT@: $(SMBCONFTORT_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB)
 	@echo Linking $@
-	@$(CC) @PIE_LDFLAGS@ -o $@ $(SMBCONFTORT_OBJ) $(LDFLAGS) \
+	@$(CC) -o $@ $(SMBCONFTORT_OBJ) $(LDFLAGS) \
 		$(DYNEXP) $(LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
 
@@ -1779,7 +1779,7 @@ bin/debug2html at EXEEXT@: $(BINARY_PREREQS) $(DEBUG2HTML_OBJ) @BUILD_POPT@ $(LIBTA
 
 bin/smbfilter at EXEEXT@: $(BINARY_PREREQS) $(SMBFILTER_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
 	@echo Linking $@
-	@$(CC) -o $@ $(SMBFILTER_OBJ) $(LDFLAGS) $(LIBS) \
+	@$(CC) -o $@ $(SMBFILTER_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
 		$(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
 		@LIBWBCLIENT_STATIC@ $(LIBWBCLIENT_LIBS) \
 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(ZLIB_LIBS)
diff --git a/source3/configure.in b/source3/configure.in
index ff19e19..416fb67 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -261,7 +261,7 @@ else
 fi
 AC_SUBST(BROKEN_CC)
 
-dnl Check if the C compiler understands -Werror
+dnl Check if the C compiler understands -Werror (GNU)
 AC_CACHE_CHECK([that the C compiler understands -Werror],samba_cv_HAVE_Werror, [
  AC_TRY_RUN_STRICT([
   int main(void)
@@ -283,7 +283,7 @@ AC_CACHE_CHECK([that the C compiler understands -w2],samba_cv_HAVE_w2, [
 if test x"$samba_cv_HAVE_w2" = x"yes"; then
    Werror_FLAGS="-w2"
 else
-dnl Check if the C compiler understands -errwarn
+dnl Check if the C compiler understands -errwarn (Sun)
 AC_CACHE_CHECK([that the C compiler understands -errwarn],samba_cv_HAVE_errwarn, [
   AC_TRY_RUN_STRICT([
    int main(void)
@@ -293,6 +293,18 @@ AC_CACHE_CHECK([that the C compiler understands -errwarn],samba_cv_HAVE_errwarn,
    samba_cv_HAVE_errwarn=yes,samba_cv_HAVE_errwarn=no,samba_cv_HAVE_errwarn=cross)])
 if test x"$samba_cv_HAVE_errwarn" = x"yes"; then
    Werror_FLAGS="-errwarn=%all"
+else
+dnl Check if the C compiler understands -qhalt (IBM)
+AC_CACHE_CHECK([that the C compiler understands -qhalt],samba_cv_HAVE_qhalt, [
+  AC_TRY_RUN_STRICT([
+   int main(void)
+   {
+	return 0;
+   }],[$CFLAGS -qhalt=w],[$CPPFLAGS],[$LDFLAGS],
+   samba_cv_HAVE_qhalt=yes,samba_cv_HAVE_qhalt=no,samba_cv_HAVE_qhalt=cross)])
+if test x"$samba_cv_HAVE_qhalt" = x"yes"; then
+   Werror_FLAGS="-qhalt=w"
+fi
 fi
 fi
 fi
@@ -1424,9 +1436,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
@@ -1515,13 +1527,10 @@ DSO_EXPORTS=""
 				if test "${ac_cv_prog_gnu_ld}" = "yes"; then
 					DYNEXP="-Wl,-E"
 				fi
-				# TODO: need to add $CFLAGS here for explicit 64-bit builds?
 				LDSHFLAGS="-shared"
 			else
 				PICFLAG="-KPIC"
-				## ${CFLAGS} added for building 64-bit shared
-				## libs using Sun's Compiler
-				LDSHFLAGS="-G \${CFLAGS}"
+				LDSHFLAGS="-G"
 			fi
 			if test "$ac_cv_prog_gnu_ld" = "yes"; then
 				SONAMEFLAG="-Wl,-soname="
@@ -1762,10 +1771,13 @@ AC_CACHE_CHECK([whether building shared libraries actually works],
    ac_cv_shlib_works=no
    # The $SHLD and $LDSHFLAGS variables may contain references to other
    # variables so they need to be eval'ed.
-   $CC $CPPFLAGS $CFLAGS $PICFLAG -c -o \
-	shlib.o ${srcdir-.}/../tests/shlib.c && \
-   `eval echo $SHLD` `eval echo $LDSHFLAGS` -o "shlib.$SHLIBEXT" \
-        shlib.o && ac_cv_shlib_works=yes
+   if AC_TRY_COMMAND([$CC $CPPFLAGS $CFLAGS $PICFLAG -c -o shlib.o ${srcdir-.}/../tests/shlib.c 1>&AS_MESSAGE_LOG_FD])
+   then
+     if AC_TRY_COMMAND([`eval echo "$SHLD $LDSHFLAGS $PICFLAG"` -o "shlib.$SHLIBEXT" shlib.o 1>&AS_MESSAGE_LOG_FD])
+     then
+       ac_cv_shlib_works=yes
+     fi
+   fi
    rm -f "shlib.$SHLIBEXT" shlib.o
 
 ])
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