Attachment 13474 Details for Bug 12961 – git patch

[patch] git patch

git.patch (text/plain), 3.31 KB, created by Jura Sasek on 2017-08-15 18:03:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jura Sasek

Created: 2017-08-15 18:03:25 UTC

Size: 3.31 KB

patch

obsolete

>From 0022c56f8689e15de8e4c680139e9cdffeda1170 Mon Sep 17 00:00:00 2001
>From: Jiri Sasek <Jiri.Sasek@Sun.COM>
>Date: Tue, 15 Aug 2017 18:45:23 +0200
>Subject: [PATCH] Bug 12961 - Solaris Studio C build issues
>
>---
> lib/ldb/tests/ldb_mod_op_test.c | 8 ++++----
> lib/replace/wscript             | 5 ++++-
> source3/wscript_build           | 1 +
> third_party/cmocka/cmocka.h     | 2 +-
> 4 files changed, 10 insertions(+), 6 deletions(-)
>
>diff --git a/lib/ldb/tests/ldb_mod_op_test.c b/lib/ldb/tests/ldb_mod_op_test.c
>index 96d2dd27df2..841068dd88b 100644
>--- a/lib/ldb/tests/ldb_mod_op_test.c
>+++ b/lib/ldb/tests/ldb_mod_op_test.c
>@@ -1829,22 +1829,22 @@ static void test_ldb_modify_during_search(void **state, bool add_index,
> 
> static void test_ldb_modify_during_indexed_search(void **state)
> {
>-	return test_ldb_modify_during_search(state, true, false);
>+	test_ldb_modify_during_search(state, true, false);
> }
> 
> static void test_ldb_modify_during_unindexed_search(void **state)
> {
>-	return test_ldb_modify_during_search(state, false, false);
>+	test_ldb_modify_during_search(state, false, false);
> }
> 
> static void test_ldb_rename_during_indexed_search(void **state)
> {
>-	return test_ldb_modify_during_search(state, true, true);
>+	test_ldb_modify_during_search(state, true, true);
> }
> 
> static void test_ldb_rename_during_unindexed_search(void **state)
> {
>-	return test_ldb_modify_during_search(state, false, true);
>+	test_ldb_modify_during_search(state, false, true);
> }
> 
> /*
>diff --git a/lib/replace/wscript b/lib/replace/wscript
>index 7c50e1daf85..58f2d599cab 100644
>--- a/lib/replace/wscript
>+++ b/lib/replace/wscript
>@@ -81,6 +81,8 @@ def configure(conf):
>     conf.CHECK_HEADERS('sys/atomic.h')
>     conf.CHECK_HEADERS('libgen.h')
> 
>+    if conf.CHECK_CFLAGS('-Wno-format-zero-length'):
>+        conf.define('HAVE_WNO_FORMAT_ZERO_LENGTH', '1')
>     if conf.CHECK_CFLAGS('-Wno-format-truncation'):
>         conf.define('HAVE_WNO_FORMAT_TRUNCATION', '1')
> 
>@@ -714,7 +716,8 @@ def build(bld):
>                       private_library=True,
>                       deps='crypt dl nsl socket rt attr' + extra_libs)
> 
>-    replace_test_cflags="-Wno-format-zero-length"
>+    if bld.CONFIG_SET('HAVE_WNO_FORMAT_ZERO_LENGTH'):
>+        replace_test_cflags="-Wno-format-zero-length"
>     if bld.CONFIG_SET('HAVE_WNO_FORMAT_TRUNCATION'):
>         replace_test_cflags += " -Wno-format-truncation"
>     bld.SAMBA_SUBSYSTEM('replace-test',
>diff --git a/source3/wscript_build b/source3/wscript_build
>index 4230b6a3778..8f7ac84d30c 100644
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -572,6 +572,7 @@ bld.SAMBA3_SUBSYSTEM('SMBCONF_PARAM',
>                         PARAM_UTIL
>                         ldap
>                         lber
>+                        krb5
>                         LOADPARM_CTX
>                         samba3core
>                         param_local.h
>diff --git a/third_party/cmocka/cmocka.h b/third_party/cmocka/cmocka.h
>index 72d6ae21c90..440686f3b3f 100644
>--- a/third_party/cmocka/cmocka.h
>+++ b/third_party/cmocka/cmocka.h
>@@ -56,7 +56,7 @@ int __stdcall IsDebuggerPresent();
> 
> /* If __WORDSIZE is not set, try to figure it out and default to 32 bit. */
> #ifndef __WORDSIZE
>-# if defined(__x86_64__) && !defined(__ILP32__)
>+# if (defined(__x86_64__) || defined(_LP64)) && !defined(__ILP32__)
> #  define __WORDSIZE 64
> # else
> #  define __WORDSIZE 32
>-- 
>2.13.0
>

Actions: View

Attachments on bug 12961: 13461 | 13462 | 13463 | 13464 | 13474