Attachment 9007 Details for Bug 9911 – Next try

[patch] Next try

9911.patch (text/plain), 9.65 KB, created by Christian Ambach on 2013-06-30 10:14:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian Ambach

Created: 2013-06-30 10:14:48 UTC

Size: 9.65 KB

patch

obsolete

>From 13a98bcc8ffee531f9d1c788da38e893d49423bd Mon Sep 17 00:00:00 2001
>From: Christian Ambach <ambi@samba.org>
>Date: Thu, 20 Jun 2013 18:26:04 +0200
>Subject: [PATCH 1/5] waf: fix build on AIX7
>
>the same works for AIX 5,6,7 so leave away the version specifics (as autoconf build did)
>
>Signed-off-by: Christian Ambach <ambi@samba.org>
>---
> buildtools/wafsamba/wscript | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
>index 17aef27..d115b5f 100755
>--- a/buildtools/wafsamba/wscript
>+++ b/buildtools/wafsamba/wscript
>@@ -322,7 +322,7 @@ def configure(conf):
>     else:
>         conf.env.HAVE_LD_VERSION_SCRIPT = False
> 
>-    if sys.platform == "aix5" or sys.platform == "aix6":
>+    if sys.platform.startswith('aix'):
>         conf.DEFINE('_ALL_SOURCE', 1, add_to_cflags=True)
>         # Might not be needed if ALL_SOURCE is defined
>         # conf.DEFINE('_XOPEN_SOURCE', 600, add_to_cflags=True)
>-- 
>1.8.1.2
>
>
>From cb0f5ce20c2f6d8060b04fedc7fd29db6d2c570f Mon Sep 17 00:00:00 2001
>From: Christian Ambach <ambi@samba.org>
>Date: Thu, 20 Jun 2013 18:27:13 +0200
>Subject: [PATCH 2/5] s3:lib/system fix build on AIX 7
>
>AIX uses struct stat64 with struct timespec64, do direct assignment does
>not work any more.
>
>Pair-Programmed-With: Volker Lendecke <vl@samba.org>
>Signed-off-by: Christian Ambach <ambi@samba.org>
>---
> source3/lib/system.c | 15 ++++++++++++---
> 1 file changed, 12 insertions(+), 3 deletions(-)
>
>diff --git a/source3/lib/system.c b/source3/lib/system.c
>index 8dbf7dc..8252e4f 100644
>--- a/source3/lib/system.c
>+++ b/source3/lib/system.c
>@@ -228,7 +228,10 @@ static struct timespec get_atimespec(const struct stat *pst)
> 	return ret;
> #else
> #if defined(HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC)
>-	return pst->st_atim;
>+	struct timespec ret;
>+	ret.tv_sec = pst->st_atim.tv_sec;
>+	ret.tv_nsec = pst->st_atim.tv_nsec;
>+	return ret;
> #elif defined(HAVE_STRUCT_STAT_ST_MTIMENSEC)
> 	struct timespec ret;
> 	ret.tv_sec = pst->st_atime;
>@@ -263,7 +266,10 @@ static struct timespec get_mtimespec(const struct stat *pst)
> 	return ret;
> #else
> #if defined(HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC)
>-	return pst->st_mtim;
>+	struct timespec ret;
>+	ret.tv_sec = pst->st_mtim.tv_sec;
>+	ret.tv_nsec = pst->st_mtim.tv_nsec;
>+	return ret;
> #elif defined(HAVE_STRUCT_STAT_ST_MTIMENSEC)
> 	struct timespec ret;
> 	ret.tv_sec = pst->st_mtime;
>@@ -298,7 +304,10 @@ static struct timespec get_ctimespec(const struct stat *pst)
> 	return ret;
> #else
> #if defined(HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC)
>-	return pst->st_ctim;
>+	struct timespec ret;
>+	ret.tv_sec = pst->st_ctim.tv_sec;
>+	ret.tv_nsec = pst->st_ctim.tv_nsec;
>+	return ret;
> #elif defined(HAVE_STRUCT_STAT_ST_MTIMENSEC)
> 	struct timespec ret;
> 	ret.tv_sec = pst->st_ctime;
>-- 
>1.8.1.2
>
>
>From 32960f54b62050c8523d3955fcb98e8b4828eeb1 Mon Sep 17 00:00:00 2001
>From: Christian Ambach <ambi@samba.org>
>Date: Tue, 25 Jun 2013 18:37:35 +0200
>Subject: [PATCH 3/5] waf: add --without-gettext option
>
>Signed-off-by: Christian Ambach <ambi@samba.org>
>---
> buildtools/wafsamba/wscript | 3 +++
> 1 file changed, 3 insertions(+)
>
>diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
>index d115b5f..fe2e515 100755
>--- a/buildtools/wafsamba/wscript
>+++ b/buildtools/wafsamba/wscript
>@@ -82,6 +82,9 @@ def set_options(opt):
>                    help='additional directory to search for gettext',
>                    action='store', dest='gettext_location', default='/usr/local',
>                    match = ['Checking for library intl', 'Checking for header libintl.h'])
>+    opt.add_option('--without-gettext',
>+                   help=("Disable use of gettext"),
>+                   action="store_true", dest='disable_gettext', default=False)
> 
>     gr = opt.option_group('developer options')
> 
>-- 
>1.8.1.2
>
>
>From 171432f4949407371e3b69824a7aee1defd7a2cd Mon Sep 17 00:00:00 2001
>From: Christian Ambach <ambi@samba.org>
>Date: Tue, 25 Jun 2013 18:38:23 +0200
>Subject: [PATCH 4/5] lib/replace skip gettext checks when configured with
> --without-gettext
>
>Signed-off-by: Christian Ambach <ambi@samba.org>
>---
> lib/replace/wscript | 24 +++++++++++++-----------
> 1 file changed, 13 insertions(+), 11 deletions(-)
>
>diff --git a/lib/replace/wscript b/lib/replace/wscript
>index 2117f56..43a7ff0 100644
>--- a/lib/replace/wscript
>+++ b/lib/replace/wscript
>@@ -363,17 +363,19 @@ removeea setea
>                         headers='netinet/in.h arpa/nameser.h resolv.h')
> 
> 
>-    if not conf.CHECK_FUNCS_IN('gettext', 'intl', checklibc=True, headers='libintl.h'):
>-    # Some hosts need lib iconv for linking with lib intl
>-    # So we try with flags just in case it helps.
>-        oldflags = conf.env['LDFLAGS_INTL']
>-        conf.env['LDFLAGS_INTL'] = "-liconv"
>-        if not conf.CHECK_LIB('intl'):
>-            conf.env['LDFLAGS_INTL'] = oldflags
>-        else:
>-            conf.CHECK_FUNCS_IN('gettext', 'intl', checklibc=True, headers='libintl.h')
>-
>-    conf.CHECK_FUNCS_IN('dgettext gettext', 'intl', headers='libintl.h')
>+    if not Options.options.disable_gettext:
>+        if not conf.CHECK_FUNCS_IN('gettext', 'intl', checklibc=True, headers='libintl.h'):
>+        # Some hosts need lib iconv for linking with lib intl
>+        # So we try with flags just in case it helps.
>+            oldflags = conf.env['LDFLAGS_INTL']
>+            conf.env['LDFLAGS_INTL'] = "-liconv"
>+            if not conf.CHECK_LIB('intl'):
>+                conf.env['LDFLAGS_INTL'] = oldflags
>+            else:
>+                conf.CHECK_FUNCS_IN('gettext', 'intl', checklibc=True, headers='libintl.h')
>+
>+        conf.CHECK_FUNCS_IN('dgettext gettext', 'intl', headers='libintl.h')
>+
>     conf.CHECK_FUNCS_IN('pthread_create', 'pthread', checklibc=True, headers='pthread.h')
> 
>     conf.CHECK_FUNCS_IN('crypt', 'crypt', checklibc=True)
>-- 
>1.8.1.2
>
>
>From 23f42973c0d7903d384def868d23be17d4ad6380 Mon Sep 17 00:00:00 2001
>From: Christian Ambach <ambi@samba.org>
>Date: Tue, 25 Jun 2013 18:39:24 +0200
>Subject: [PATCH 5/5] s3-waf: skip tests for gettext
>
>this is already done in lib/replace
>
>Signed-off-by: Christian Ambach <ambi@samba.org>
>---
> source3/wscript                         | 6 +++---
> source3/wscript_build                   | 1 -
> source4/heimdal_build/wscript_build     | 4 ++--
> source4/heimdal_build/wscript_configure | 2 +-
> 4 files changed, 6 insertions(+), 7 deletions(-)
>
>diff --git a/source3/wscript b/source3/wscript
>index 3c0145b..a250036 100644
>--- a/source3/wscript
>+++ b/source3/wscript
>@@ -98,7 +98,7 @@ def configure(conf):
>     conf.CHECK_FUNCS('memalign posix_memalign hstrerror')
>     conf.CHECK_FUNCS('shmget')
>     conf.CHECK_FUNCS_IN('shm_open', 'rt', checklibc=True)
>-    conf.CHECK_FUNCS('gettext dgettext bindtextdomain textdomain bind_textdomain_codeset')
>+    conf.CHECK_FUNCS('bindtextdomain textdomain bind_textdomain_codeset')
>     #FIXME: for some reason this one still fails
>     conf.CHECK_FUNCS_IN('yp_get_default_domain', 'nsl')
>     conf.CHECK_FUNCS_IN('dn_expand _dn_expand __dn_expand', 'resolv')
>@@ -332,7 +332,7 @@ if (0) {
>     conf.CHECK_FUNCS('''
> _acl __acl atexit 
> bindtextdomain _chdir __chdir chflags chmod _close __close _closedir
>-__closedir crypt16 devnm dgettext dirfd
>+__closedir crypt16 devnm dirfd
> DNSServiceRegister _dup __dup _dup2 __dup2 endmntent execl
> _facl __facl _fchdir
> __fchdir fchmod fchown _fcntl __fcntl fcvt fcvtl fdatasync
>@@ -341,7 +341,7 @@ fsetxattr _fstat __fstat fsync
> futimens futimes __fxstat getauthuid
> getcwd _getcwd __getcwd getdents __getdents getdirentries
> getgrent getgrnam getgrouplist getgrset getmntent getpagesize
>-getpwanam getpwent_r getrlimit gettext
>+getpwanam getpwent_r getrlimit
> glob grantpt hstrerror initgroups innetgr
> llseek _llseek __llseek _lseek __lseek
> _lstat __lstat lutimes
>diff --git a/source3/wscript_build b/source3/wscript_build
>index 19c6d08..ae32274 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -1267,7 +1267,6 @@ bld.SAMBA3_BINARY('net',
>                  talloc
>                  netapi
>                  addns
>-                 intl
>                  popt_samba3
>                  pdb
>                  libsmb
>diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
>index 8ca8788..f392474 100644
>--- a/source4/heimdal_build/wscript_build
>+++ b/source4/heimdal_build/wscript_build
>@@ -670,7 +670,7 @@ if not bld.CONFIG_SET("USING_SYSTEM_KRB5"):
>     HEIMDAL_LIBRARY('krb5', KRB5_SOURCE,
>         version_script='lib/krb5/version-script.map',
>                         includes='../heimdal/lib/krb5 ../heimdal/lib/asn1 ../heimdal/include',
>-                deps='roken wind asn1 hx509 hcrypto intl com_err HEIMDAL_CONFIG heimbase execinfo',
>+                deps='roken wind asn1 hx509 hcrypto com_err HEIMDAL_CONFIG heimbase execinfo',
>                 vnum='26.0.0',
>                         )
>     KRB5_PROTO_SOURCE = KRB5_SOURCE + ['lib/krb5/expand_path.c', 'lib/krb5/plugin.c', 'lib/krb5/context.c']
>@@ -894,7 +894,7 @@ if not bld.CONFIG_SET('USING_SYSTEM_COM_ERR'):
>     HEIMDAL_LIBRARY('com_err',
>         'lib/com_err/com_err.c lib/com_err/error.c',
>         includes='../heimdal/lib/com_err',
>-        deps='roken intl',
>+        deps='roken',
>         vnum='0.25',
>         version_script='lib/com_err/version-script.map',
>         )
>diff --git a/source4/heimdal_build/wscript_configure b/source4/heimdal_build/wscript_configure
>index 2bb465a..969ffa1 100755
>--- a/source4/heimdal_build/wscript_configure
>+++ b/source4/heimdal_build/wscript_configure
>@@ -42,7 +42,7 @@ conf.CHECK_FUNCS_IN('''getnameinfo sendmsg socket getipnodebyname gethostent get
>                     'socket nsl',
>                     checklibc=True)
> 
>-conf.CHECK_FUNCS_IN('dgettext gettext', 'intl', headers='libintl.h')
>+#conf.CHECK_FUNCS_IN('dgettext gettext', 'intl', headers='libintl.h')
> 
> conf.CHECK_FUNCS('iruserok')
> 
>-- 
>1.8.1.2
>

Actions: View

Attachments on bug 9911: 8964 | 8987 | 8998 | 9007 | 9106 | 9107 | 9114 | 9115 | 9127 | 9419 | 9482 | 9483 | 9500 | 9554 | 9746 | 9747