samba: update cross-answers files

Replace the configure tests UNKNOWN answers with the correct answers.
Then drop the related patches.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Yi Zhao
2021-11-25 10:44:50 +08:00
committed by Khem Raj
parent d3eb0a9e84
commit 2fb000b020
21 changed files with 80 additions and 253 deletions
@@ -38,3 +38,8 @@ Checking whether blkcnt_t is 32 bit: NO
Checking whether blkcnt_t is 64 bit: OK Checking whether blkcnt_t is 64 bit: OK
Checking whether fcntl lock supports open file description locks: OK Checking whether fcntl lock supports open file description locks: OK
Checking for a 64-bit host to support lmdb: OK Checking for a 64-bit host to support lmdb: OK
Checking errno of iconv for illegal multibyte sequence: NO
Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
Checking value of GNUTLS_MAC_AES_CMAC_128: OK
Checking whether fcntl supports flags to send direct I/O availability signals: NO
Checking whether fcntl supports setting/geting hints: NO
@@ -38,3 +38,8 @@ Checking whether blkcnt_t is 32 bit: NO
Checking whether blkcnt_t is 64 bit: OK Checking whether blkcnt_t is 64 bit: OK
Checking whether fcntl lock supports open file description locks: OK Checking whether fcntl lock supports open file description locks: OK
Checking for a 64-bit host to support lmdb: OK Checking for a 64-bit host to support lmdb: OK
Checking errno of iconv for illegal multibyte sequence: NO
Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
Checking value of GNUTLS_MAC_AES_CMAC_128: OK
Checking whether fcntl supports flags to send direct I/O availability signals: NO
Checking whether fcntl supports setting/geting hints: NO
@@ -39,3 +39,8 @@ Checking whether blkcnt_t is 32 bit: NO
Checking whether blkcnt_t is 64 bit: OK Checking whether blkcnt_t is 64 bit: OK
Checking whether fcntl lock supports open file description locks: OK Checking whether fcntl lock supports open file description locks: OK
Checking for a 64-bit host to support lmdb: NO Checking for a 64-bit host to support lmdb: NO
Checking errno of iconv for illegal multibyte sequence: NO
Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
Checking value of GNUTLS_MAC_AES_CMAC_128: OK
Checking whether fcntl supports flags to send direct I/O availability signals: NO
Checking whether fcntl supports setting/geting hints: NO
@@ -39,3 +39,8 @@ Checking whether blkcnt_t is 32 bit: NO
Checking whether blkcnt_t is 64 bit: OK Checking whether blkcnt_t is 64 bit: OK
Checking whether fcntl lock supports open file description locks: OK Checking whether fcntl lock supports open file description locks: OK
Checking for a 64-bit host to support lmdb: NO Checking for a 64-bit host to support lmdb: NO
Checking errno of iconv for illegal multibyte sequence: NO
Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
Checking value of GNUTLS_MAC_AES_CMAC_128: OK
Checking whether fcntl supports flags to send direct I/O availability signals: NO
Checking whether fcntl supports setting/geting hints: NO
@@ -39,3 +39,8 @@ Checking whether blkcnt_t is 32 bit: NO
Checking whether blkcnt_t is 64 bit: OK Checking whether blkcnt_t is 64 bit: OK
Checking whether fcntl lock supports open file description locks: OK Checking whether fcntl lock supports open file description locks: OK
Checking for a 64-bit host to support lmdb: NO Checking for a 64-bit host to support lmdb: NO
Checking errno of iconv for illegal multibyte sequence: NO
Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
Checking value of GNUTLS_MAC_AES_CMAC_128: OK
Checking whether fcntl supports flags to send direct I/O availability signals: NO
Checking whether fcntl supports setting/geting hints: NO
@@ -39,3 +39,8 @@ Checking whether blkcnt_t is 32 bit: NO
Checking whether blkcnt_t is 64 bit: OK Checking whether blkcnt_t is 64 bit: OK
Checking whether fcntl lock supports open file description locks: OK Checking whether fcntl lock supports open file description locks: OK
Checking for a 64-bit host to support lmdb: NO Checking for a 64-bit host to support lmdb: NO
Checking errno of iconv for illegal multibyte sequence: NO
Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
Checking value of GNUTLS_MAC_AES_CMAC_128: OK
Checking whether fcntl supports flags to send direct I/O availability signals: NO
Checking whether fcntl supports setting/geting hints: NO
@@ -39,3 +39,8 @@ Checking whether blkcnt_t is 32 bit: NO
Checking whether blkcnt_t is 64 bit: OK Checking whether blkcnt_t is 64 bit: OK
Checking whether fcntl lock supports open file description locks: OK Checking whether fcntl lock supports open file description locks: OK
Checking for a 64-bit host to support lmdb: NO Checking for a 64-bit host to support lmdb: NO
Checking errno of iconv for illegal multibyte sequence: NO
Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
Checking value of GNUTLS_MAC_AES_CMAC_128: OK
Checking whether fcntl supports flags to send direct I/O availability signals: NO
Checking whether fcntl supports setting/geting hints: NO
@@ -38,3 +38,8 @@ Checking whether blkcnt_t is 32 bit: NO
Checking whether blkcnt_t is 64 bit: OK Checking whether blkcnt_t is 64 bit: OK
Checking whether fcntl lock supports open file description locks: OK Checking whether fcntl lock supports open file description locks: OK
Checking for a 64-bit host to support lmdb: OK Checking for a 64-bit host to support lmdb: OK
Checking errno of iconv for illegal multibyte sequence: NO
Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
Checking value of GNUTLS_MAC_AES_CMAC_128: OK
Checking whether fcntl supports flags to send direct I/O availability signals: NO
Checking whether fcntl supports setting/geting hints: NO
@@ -38,3 +38,8 @@ Checking whether blkcnt_t is 32 bit: NO
Checking whether blkcnt_t is 64 bit: OK Checking whether blkcnt_t is 64 bit: OK
Checking whether fcntl lock supports open file description locks: OK Checking whether fcntl lock supports open file description locks: OK
Checking for a 64-bit host to support lmdb: OK Checking for a 64-bit host to support lmdb: OK
Checking errno of iconv for illegal multibyte sequence: NO
Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
Checking value of GNUTLS_MAC_AES_CMAC_128: OK
Checking whether fcntl supports flags to send direct I/O availability signals: NO
Checking whether fcntl supports setting/geting hints: NO
@@ -39,3 +39,8 @@ Checking whether blkcnt_t is 32 bit: NO
Checking whether blkcnt_t is 64 bit: OK Checking whether blkcnt_t is 64 bit: OK
Checking whether fcntl lock supports open file description locks: OK Checking whether fcntl lock supports open file description locks: OK
Checking for a 64-bit host to support lmdb: NO Checking for a 64-bit host to support lmdb: NO
Checking errno of iconv for illegal multibyte sequence: NO
Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
Checking value of GNUTLS_MAC_AES_CMAC_128: OK
Checking whether fcntl supports flags to send direct I/O availability signals: NO
Checking whether fcntl supports setting/geting hints: NO
@@ -39,3 +39,8 @@ Checking whether blkcnt_t is 32 bit: NO
Checking whether blkcnt_t is 64 bit: OK Checking whether blkcnt_t is 64 bit: OK
Checking whether fcntl lock supports open file description locks: OK Checking whether fcntl lock supports open file description locks: OK
Checking for a 64-bit host to support lmdb: NO Checking for a 64-bit host to support lmdb: NO
Checking errno of iconv for illegal multibyte sequence: NO
Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
Checking value of GNUTLS_MAC_AES_CMAC_128: OK
Checking whether fcntl supports flags to send direct I/O availability signals: NO
Checking whether fcntl supports setting/geting hints: NO
@@ -39,3 +39,8 @@ Checking whether blkcnt_t is 32 bit: NO
Checking whether blkcnt_t is 64 bit: OK Checking whether blkcnt_t is 64 bit: OK
Checking whether fcntl lock supports open file description locks: OK Checking whether fcntl lock supports open file description locks: OK
Checking for a 64-bit host to support lmdb: OK Checking for a 64-bit host to support lmdb: OK
Checking errno of iconv for illegal multibyte sequence: NO
Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
Checking value of GNUTLS_MAC_AES_CMAC_128: OK
Checking whether fcntl supports flags to send direct I/O availability signals: NO
Checking whether fcntl supports setting/geting hints: NO
@@ -39,3 +39,8 @@ Checking whether blkcnt_t is 32 bit: NO
Checking whether blkcnt_t is 64 bit: OK Checking whether blkcnt_t is 64 bit: OK
Checking whether fcntl lock supports open file description locks: OK Checking whether fcntl lock supports open file description locks: OK
Checking for a 64-bit host to support lmdb: OK Checking for a 64-bit host to support lmdb: OK
Checking errno of iconv for illegal multibyte sequence: NO
Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
Checking value of GNUTLS_MAC_AES_CMAC_128: OK
Checking whether fcntl supports flags to send direct I/O availability signals: NO
Checking whether fcntl supports setting/geting hints: NO
@@ -39,3 +39,8 @@ Checking whether blkcnt_t is 32 bit: NO
Checking whether blkcnt_t is 64 bit: OK Checking whether blkcnt_t is 64 bit: OK
Checking whether fcntl lock supports open file description locks: OK Checking whether fcntl lock supports open file description locks: OK
Checking for a 64-bit host to support lmdb: NO Checking for a 64-bit host to support lmdb: NO
Checking errno of iconv for illegal multibyte sequence: NO
Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
Checking value of GNUTLS_MAC_AES_CMAC_128: OK
Checking whether fcntl supports flags to send direct I/O availability signals: NO
Checking whether fcntl supports setting/geting hints: NO
@@ -38,3 +38,8 @@ Checking whether blkcnt_t is 32 bit: NO
Checking whether blkcnt_t is 64 bit: OK Checking whether blkcnt_t is 64 bit: OK
Checking whether fcntl lock supports open file description locks: OK Checking whether fcntl lock supports open file description locks: OK
Checking for a 64-bit host to support lmdb: OK Checking for a 64-bit host to support lmdb: OK
Checking errno of iconv for illegal multibyte sequence: NO
Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
Checking value of GNUTLS_MAC_AES_CMAC_128: OK
Checking whether fcntl supports flags to send direct I/O availability signals: NO
Checking whether fcntl supports setting/geting hints: NO
@@ -38,3 +38,8 @@ Checking whether blkcnt_t is 32 bit: NO
Checking whether blkcnt_t is 64 bit: OK Checking whether blkcnt_t is 64 bit: OK
Checking whether fcntl lock supports open file description locks: OK Checking whether fcntl lock supports open file description locks: OK
Checking for a 64-bit host to support lmdb: OK Checking for a 64-bit host to support lmdb: OK
Checking errno of iconv for illegal multibyte sequence: NO
Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
Checking value of GNUTLS_MAC_AES_CMAC_128: OK
Checking whether fcntl supports flags to send direct I/O availability signals: NO
Checking whether fcntl supports setting/geting hints: NO
@@ -1,39 +0,0 @@
From 59f7098bfbd63f9b3c19d7d297a8f90870a1893d Mon Sep 17 00:00:00 2001
From: Joe Slater <joe.slater@windriver.com>
Date: Mon, 31 May 2021 14:50:38 +0800
Subject: [PATCH] samba: defeat iconv test
A test was added when configuring samba which requires target code
to be executed. In general, this will not work, so we eliminate it.
Upstream-Status: Pending
Signed-off-by: Joe Slater <joe.slater@windriver.com>
---
lib/util/charset/wscript_configure | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lib/util/charset/wscript_configure b/lib/util/charset/wscript_configure
index 9c27fc6..845eb36 100644
--- a/lib/util/charset/wscript_configure
+++ b/lib/util/charset/wscript_configure
@@ -17,6 +17,8 @@ if (conf.CHECK_FUNCS_IN('iconv_open', 'iconv', checklibc=False, headers='iconv.h
conf.DEFINE('HAVE_NATIVE_ICONV', 1)
+"""
+[added for 4.7.0, but breaks cross-compilation]
conf.CHECK_CODE('''
uint8_t inbuf[2] = { 0x30, 0xdf };
uint8_t outbuf[4] = { 0 };
@@ -36,6 +38,7 @@ conf.CHECK_CODE('''
msg='Checking errno of iconv for illegal multibyte sequence',
lib='iconv',
headers='errno.h iconv.h')
+"""
if conf.CHECK_CFG(package='icu-i18n',
args='--cflags --libs',
--
2.17.1
@@ -1,39 +0,0 @@
From a31a014c5d98501074fde1acb5c00162c927c361 Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Mon, 31 May 2021 15:47:58 +0800
Subject: [PATCH] wscript_configure_system_gnutls: disable check gnutls
AES_CFB8/AES_CMAC
The CHECK_VALUEOF() can not work on cross-compilation.
Fixes configure error:
Checking value of GNUTLS_CIPHER_AES_128_CFB8: UNKNOWN
Checking value of GNUTLS_MAC_AES_CMAC_128: UNKNOWN
Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
wscript_configure_system_gnutls | 2 ++
1 file changed, 2 insertions(+)
diff --git a/wscript_configure_system_gnutls b/wscript_configure_system_gnutls
index 2ec217f..cd91b55 100644
--- a/wscript_configure_system_gnutls
+++ b/wscript_configure_system_gnutls
@@ -39,6 +39,7 @@ if (parse_version(gnutls_version) > parse_version('3.6.14')):
if conf.CHECK_FUNCS_IN('gnutls_get_system_config_file', 'gnutls'):
conf.DEFINE('HAVE_GNUTLS_CRYPTO_POLICIES', 1)
+"""
if conf.CHECK_VALUEOF('GNUTLS_CIPHER_AES_128_CFB8', headers='gnutls/gnutls.h'):
conf.DEFINE('HAVE_GNUTLS_AES_CFB8', 1)
else:
@@ -48,3 +49,4 @@ if conf.CHECK_VALUEOF('GNUTLS_MAC_AES_CMAC_128', headers='gnutls/gnutls.h'):
conf.DEFINE('HAVE_GNUTLS_AES_CMAC', 1)
else:
Logs.warn('No gnutls support for AES CMAC')
+"""
--
2.17.1
@@ -1,79 +0,0 @@
From ba6bc5459cf148dd617fd9cd38dd50c3a9b5d706 Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Mon, 31 May 2021 15:50:48 +0800
Subject: [PATCH] source3/wscript: disable check fcntl F_OWNER_EX
It fails on cross-compilation.
Fixes configure error:
Checking whether fcntl supports flags to send direct I/O availability signals: UNKNOWN
Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
source3/wscript | 48 ------------------------------------------------
1 file changed, 48 deletions(-)
diff --git a/source3/wscript b/source3/wscript
index adc31ce..f6de0a6 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -1168,54 +1168,6 @@ err:
#include <fcntl.h>
#include <unistd.h>
#include <stdlib.h>
-#include <sys/socket.h>
-
-int main(void)
-{
- int sockfd, ret;
- struct f_owner_ex owner, get_owner;
-
- sockfd = socket(AF_UNIX, SOCK_STREAM, 0);
- if (sockfd == -1) {
- goto err;
- }
-
- owner.type = F_OWNER_PID;
- owner.pid = getpid();
-
- ret = fcntl(sockfd, F_SETOWN_EX, &owner);
- if (ret == -1) {
- goto err;
- }
-
- ret = fcntl(sockfd, F_GETOWN_EX, &get_owner);
- if (ret == -1) {
- goto err;
- }
-
- if (get_owner.type != F_OWNER_PID) {
- goto err;
- }
-
- if (get_owner.pid != getpid()) {
- goto err;
- }
-
- close(sockfd);
- exit(0);
-err:
- close(sockfd);
- exit(1);
-}''',
- 'HAVE_F_OWNER_EX',
- addmain=False,
- execute=True,
- msg="Checking whether fcntl supports flags to send direct I/O availability signals")
-
- conf.CHECK_CODE('''
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdlib.h>
#include <stdint.h>
#define DATA "hinttest.fcntl"
--
2.17.1
@@ -1,92 +0,0 @@
From 9942bca2e276c7b4c7696a08594258430c4c5bb5 Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Thu, 3 Jun 2021 09:39:56 +0800
Subject: [PATCH] source3/wscript: disable check fcntl RW_HINTS
It fails on cross-compilation for musl.
Fixes configure error:
Checking whether fcntl supports setting/geting hints: UNKNOWN
Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
source3/wscript | 61 -------------------------------------------------
1 file changed, 61 deletions(-)
diff --git a/source3/wscript b/source3/wscript
index f6de0a6..3e260c1 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -1164,67 +1164,6 @@ err:
execute=True,
msg="Checking whether fcntl lock supports open file description locks")
- conf.CHECK_CODE('''
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdint.h>
-
-#define DATA "hinttest.fcntl"
-
-int main(void)
-{
- uint64_t hint, get_hint;
- int fd;
-
- fd = open(DATA, O_RDONLY | O_CREAT | O_EXCL);
- if (fd == -1) {
- goto err;
- }
-
- hint = RWH_WRITE_LIFE_SHORT;
- int ret = fcntl(fd, F_SET_RW_HINT, &hint);
- if (ret == -1) {
- goto err;
- }
-
- ret = fcntl(fd, F_GET_RW_HINT, &get_hint);
- if (ret == -1) {
- goto err;
- }
-
- if (get_hint != RWH_WRITE_LIFE_SHORT) {
- goto err;
- }
-
- hint = RWH_WRITE_LIFE_EXTREME;
- ret = fcntl(fd, F_SET_FILE_RW_HINT, &hint);
- if (ret == -1) {
- goto err;
- }
-
- ret = fcntl(fd, F_GET_FILE_RW_HINT, &get_hint);
- if (ret == -1) {
- goto err;
- }
-
- if (get_hint != RWH_WRITE_LIFE_EXTREME) {
- goto err;
- }
-
- close(fd);
- unlink(DATA);
- exit(0);
-err:
- close(fd);
- unlink(DATA);
- exit(1);
-}''',
- 'HAVE_RW_HINTS',
- addmain=False,
- execute=True,
- msg="Checking whether fcntl supports setting/geting hints")
-
conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_mtim.tv_nsec',
define='HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC') # Linux, Solaris
conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_mtimensec',
--
2.17.1
@@ -20,10 +20,6 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \
file://0003-Add-config-option-without-valgrind.patch \ file://0003-Add-config-option-without-valgrind.patch \
file://0004-Add-options-to-configure-the-use-of-libbsd.patch \ file://0004-Add-options-to-configure-the-use-of-libbsd.patch \
file://0005-samba-build-dnsserver_common-code.patch \ file://0005-samba-build-dnsserver_common-code.patch \
file://0006-samba-defeat-iconv-test.patch \
file://0007-wscript_configure_system_gnutls-disable-check-gnutls.patch \
file://0008-source3-wscript-disable-check-fcntl-F_OWNER_EX.patch \
file://0009-source3-wscript-disable-check-fcntl-RW_HINTS.patch \
file://0001-Fix-pyext_PATTERN-for-cross-compilation.patch \ file://0001-Fix-pyext_PATTERN-for-cross-compilation.patch \
" "