diff options
| author | Khem Raj <raj.khem@gmail.com> | 2022-08-28 11:49:52 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2022-08-28 23:57:15 -0700 |
| commit | 2d7e9e2fe7fb567b350c875cc0090169df77b65d (patch) | |
| tree | 4975156b10ac957e5d5877823eab3de6d0e84073 | |
| parent | bb8b1640c93c1603b10fe2e91cb33b97291afc87 (diff) | |
| download | meta-openembedded-2d7e9e2fe7fb567b350c875cc0090169df77b65d.tar.gz | |
samba: Fix warnings in configure tests for rpath checks
Add a patch to avoid implicit-function-declaration warnings, they will
soon become errors with clang 15+
set path for privatelibdir
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-networking/recipes-connectivity/samba/samba/0001-waf-Fix-errors-with-Werror-implicit-function-declara.patch | 32 | ||||
| -rw-r--r-- | meta-networking/recipes-connectivity/samba/samba_4.14.14.bb | 3 |
2 files changed, 35 insertions, 0 deletions
diff --git a/meta-networking/recipes-connectivity/samba/samba/0001-waf-Fix-errors-with-Werror-implicit-function-declara.patch b/meta-networking/recipes-connectivity/samba/samba/0001-waf-Fix-errors-with-Werror-implicit-function-declara.patch new file mode 100644 index 0000000000..4a89f76782 --- /dev/null +++ b/meta-networking/recipes-connectivity/samba/samba/0001-waf-Fix-errors-with-Werror-implicit-function-declara.patch | |||
| @@ -0,0 +1,32 @@ | |||
| 1 | From 28ec4c9323e67cd114a0465015c9f3c2e64e6829 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Sat, 27 Aug 2022 13:05:26 -0700 | ||
| 4 | Subject: [PATCH] waf: Fix errors with Werror=implicit-function-declaration | ||
| 5 | turned on | ||
| 6 | |||
| 7 | Clang-15 turns this option into errors by default, and it results in | ||
| 8 | rpath check failures | ||
| 9 | |||
| 10 | Upstream-Status: Pending | ||
| 11 | |||
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 13 | --- | ||
| 14 | buildtools/wafsamba/samba_waf18.py | 2 +- | ||
| 15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 16 | |||
| 17 | diff --git a/buildtools/wafsamba/samba_waf18.py b/buildtools/wafsamba/samba_waf18.py | ||
| 18 | index 7a0a08e..c0d2c3e 100644 | ||
| 19 | --- a/buildtools/wafsamba/samba_waf18.py | ||
| 20 | +++ b/buildtools/wafsamba/samba_waf18.py | ||
| 21 | @@ -209,7 +209,7 @@ def CHECK_LIBRARY_SUPPORT(conf, rpath=False, version_script=False, msg=None): | ||
| 22 | lib_node.parent.mkdir() | ||
| 23 | lib_node.write('int lib_func(void) { return 42; }\n', 'w') | ||
| 24 | main_node = bld.srcnode.make_node('main.c') | ||
| 25 | - main_node.write('int main(void) {return !(lib_func() == 42);}', 'w') | ||
| 26 | + main_node.write('int lib_func(void); int main(void) {return !(lib_func() == 42);}', 'w') | ||
| 27 | linkflags = [] | ||
| 28 | if version_script: | ||
| 29 | script = bld.srcnode.make_node('ldscript') | ||
| 30 | -- | ||
| 31 | 2.37.2 | ||
| 32 | |||
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.14.14.bb b/meta-networking/recipes-connectivity/samba/samba_4.14.14.bb index 53526a26b6..f88dee6175 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.14.14.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.14.14.bb | |||
| @@ -22,6 +22,7 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ | |||
| 22 | file://0005-samba-build-dnsserver_common-code.patch \ | 22 | file://0005-samba-build-dnsserver_common-code.patch \ |
| 23 | file://0001-Fix-pyext_PATTERN-for-cross-compilation.patch \ | 23 | file://0001-Fix-pyext_PATTERN-for-cross-compilation.patch \ |
| 24 | file://0001-smbtorture-skip-test-case-tfork_cmd_send.patch \ | 24 | file://0001-smbtorture-skip-test-case-tfork_cmd_send.patch \ |
| 25 | file://0001-waf-Fix-errors-with-Werror-implicit-function-declara.patch \ | ||
| 25 | " | 26 | " |
| 26 | 27 | ||
| 27 | SRC_URI:append:libc-musl = " \ | 28 | SRC_URI:append:libc-musl = " \ |
| @@ -113,9 +114,11 @@ EXTRA_OECONF += "--enable-fhs \ | |||
| 113 | --with-piddir=/run \ | 114 | --with-piddir=/run \ |
| 114 | --with-sockets-dir=/run/samba \ | 115 | --with-sockets-dir=/run/samba \ |
| 115 | --with-modulesdir=${libdir}/samba \ | 116 | --with-modulesdir=${libdir}/samba \ |
| 117 | --with-privatelibdir=${libdir}/samba \ | ||
| 116 | --with-lockdir=${localstatedir}/lib/samba \ | 118 | --with-lockdir=${localstatedir}/lib/samba \ |
| 117 | --with-cachedir=${localstatedir}/lib/samba \ | 119 | --with-cachedir=${localstatedir}/lib/samba \ |
| 118 | --disable-rpath-install \ | 120 | --disable-rpath-install \ |
| 121 | --disable-rpath \ | ||
| 119 | --with-shared-modules=${SAMBA4_MODULES} \ | 122 | --with-shared-modules=${SAMBA4_MODULES} \ |
| 120 | --bundled-libraries=${SAMBA4_LIBS} \ | 123 | --bundled-libraries=${SAMBA4_LIBS} \ |
| 121 | ${@oe.utils.conditional('TARGET_ARCH', 'x86_64', '', '--disable-glusterfs', d)} \ | 124 | ${@oe.utils.conditional('TARGET_ARCH', 'x86_64', '', '--disable-glusterfs', d)} \ |
