[SCM] Samba Shared Repository - branch master updated

Björn Jacke bjacke at samba.org
Thu Jul 26 12:50:02 MDT 2012


The branch, master has been updated
       via  86c2d48 buildtools: use egrep when we need the "-f patternfile" option
       via  4f0b8f3 s3/aio_fork: fix build on irix
       via  4b914a2 s3: use libreplace in pthreadpooltest to fix some builds
      from  96340e6 s3: add Darwin sendfile support and merge with the FreeBSD code

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 86c2d486f2731b0790c6a906f9fc96244a125b6f
Author: Björn Jacke <bj at sernet.de>
Date:   Thu Jul 26 18:55:43 2012 +0200

    buildtools: use egrep when we need the "-f patternfile" option
    
    Solaris' default grep doesn't know the -f option
    
    Autobuild-User(master): Björn Jacke <bj at sernet.de>
    Autobuild-Date(master): Thu Jul 26 20:49:18 CEST 2012 on sn-devel-104

commit 4f0b8f30c981249012c958768e58857d5b4c27f5
Author: Björn Jacke <bj at sernet.de>
Date:   Thu Jul 26 18:27:40 2012 +0200

    s3/aio_fork: fix build on irix
    
    IRIX needs _XOPEN_SOURCE defined for SCM_RIGHTS to be available

commit 4b914a223da0490495c1f2988172583469565eb2
Author: Björn Jacke <bj at sernet.de>
Date:   Thu Jul 26 18:07:29 2012 +0200

    s3: use libreplace in pthreadpooltest to fix some builds

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

Summary of changes:
 buildtools/compare_config_h3.sh |    4 ++--
 lib/replace/libreplace_cc.m4    |    1 +
 lib/replace/wscript             |    4 ++++
 source3/Makefile.in             |    2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/compare_config_h3.sh b/buildtools/compare_config_h3.sh
index a56dd2a..45be1ec 100755
--- a/buildtools/compare_config_h3.sh
+++ b/buildtools/compare_config_h3.sh
@@ -19,8 +19,8 @@ if test "x$DIFF" = "x" ; then
 	DIFF="comm -23"
 fi
 
-grep "^.define" $NEW_CONFIG | grep -v -f $EXCEPTIONS | sort > waf-config.h
-grep "^.define" $OLD_CONFIG | grep -v -f $EXCEPTIONS | sort > old-config.h
+grep "^.define" $NEW_CONFIG | egrep -v -f $EXCEPTIONS | sort > waf-config.h
+grep "^.define" $OLD_CONFIG | egrep -v -f $EXCEPTIONS | sort > old-config.h
 
 $DIFF old-config.h waf-config.h
 rm -f old-config.h waf-config.h
diff --git a/lib/replace/libreplace_cc.m4 b/lib/replace/libreplace_cc.m4
index c755047..e316f8b 100644
--- a/lib/replace/libreplace_cc.m4
+++ b/lib/replace/libreplace_cc.m4
@@ -63,6 +63,7 @@ AC_SYS_LARGEFILE
 dnl Add #include for broken IRIX header files
 case "$host_os" in
 	*irix6*) AC_ADD_INCLUDE(<standards.h>)
+		AC_N_DEFINE(_XOPEN_SOURCE,600)
 		;;
 	*hpux*)
 		# mmap on HPUX is completely broken...
diff --git a/lib/replace/wscript b/lib/replace/wscript
index 157296b..e178cca 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -38,6 +38,10 @@ def configure(conf):
         conf.DEFINE('_OSF_SOURCE', 1, add_to_cflags=True)
         conf.DEFINE('_XOPEN_SOURCE', 600, add_to_cflags=True)
 
+    # SCM_RIGHTS is only avail if _XOPEN_SOURCE iѕ defined on IRIX
+    if conf.env['SYSTEM_UNAME_SYSNAME'] == 'IRIX':
+        conf.DEFINE('_XOPEN_SOURCE', 600, add_to_cflags=True)
+
     conf.CHECK_HEADERS('linux/types.h crypt.h locale.h acl/libacl.h compat.h')
     conf.CHECK_HEADERS('acl/libacl.h attr/xattr.h compat.h ctype.h dustat.h')
     conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h')
diff --git a/source3/Makefile.in b/source3/Makefile.in
index b572edc..75a3262 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1195,7 +1195,7 @@ SMBCONFTORT_OBJ = $(SMBCONFTORT_OBJ0) \
 		  $(POPT_LIB_OBJ)
 
 PTHREADPOOLTEST_OBJ = lib/pthreadpool/pthreadpool.o \
-		lib/pthreadpool/tests.o
+		lib/pthreadpool/tests.o $(LIBREPLACE_OBJ)
 
 LIBNET_OBJ = libnet/libnet_join.o \
 	     libnet/libnet_keytab.o \


-- 
Samba Shared Repository


More information about the samba-cvs mailing list