From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1003F158064 for ; Tue, 30 Apr 2024 06:42:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 57FFDE2A1B; Tue, 30 Apr 2024 06:42:04 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3F8CEE2A16 for ; Tue, 30 Apr 2024 06:42:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8461933FEF1 for ; Tue, 30 Apr 2024 06:42:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B79E2179E for ; Tue, 30 Apr 2024 06:42:00 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1714459148.93b5d2f23960fd5b8b1ed13e056383b9a907940f.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/samba/files/, net-fs/samba/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-fs/samba/files/cmocka-config_h.patch net-fs/samba/samba-4.18.10.ebuild net-fs/samba/samba-4.18.8.ebuild net-fs/samba/samba-4.18.9.ebuild net-fs/samba/samba-4.19.4.ebuild X-VCS-Directories: net-fs/samba/ net-fs/samba/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 93b5d2f23960fd5b8b1ed13e056383b9a907940f X-VCS-Branch: master Date: Tue, 30 Apr 2024 06:42:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0565b0a7-67ec-4853-8832-2e1a4fc95bf4 X-Archives-Hash: 0b2f70b2cddb4c4a321a18fef1c68c03 commit: 93b5d2f23960fd5b8b1ed13e056383b9a907940f Author: Dennis Camera riiengineering ch> AuthorDate: Wed Mar 27 11:08:45 2024 +0000 Commit: Sam James gentoo org> CommitDate: Tue Apr 30 06:39:08 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93b5d2f2 net-fs/samba: fix redefinition of uintptr_t in bundled cmocka library Build failed with musl libc: In file included from ../../third_party/cmocka/cmocka.c:61: ../../third_party/cmocka/cmocka.h:127:28: error: conflicting types for 'uintptr_t'; have 'unsigned int' 127 | typedef unsigned int uintptr_t; | ^~~~~~~~~ In file included from /usr/include/stdint.h:20, from /usr/include/inttypes.h:9, from ../../third_party/cmocka/cmocka.c:27: /usr/include/bits/alltypes.h:47:24: note: previous declaration of 'uintptr_t' with type 'uintptr_t' {aka 'long unsigned int'} 47 | typedef unsigned _Addr uintptr_t; | ^~~~~~~~~ Signed-off-by: Dennis Camera riiengineering.ch> Closes: https://github.com/gentoo/gentoo/pull/35945 Signed-off-by: Sam James gentoo.org> net-fs/samba/files/cmocka-config_h.patch | 23 +++++++++++++++++++++++ net-fs/samba/samba-4.18.10.ebuild | 1 + net-fs/samba/samba-4.18.8.ebuild | 1 + net-fs/samba/samba-4.18.9.ebuild | 1 + net-fs/samba/samba-4.19.4.ebuild | 1 + 5 files changed, 27 insertions(+) diff --git a/net-fs/samba/files/cmocka-config_h.patch b/net-fs/samba/files/cmocka-config_h.patch new file mode 100644 index 000000000000..124928450cd6 --- /dev/null +++ b/net-fs/samba/files/cmocka-config_h.patch @@ -0,0 +1,23 @@ +--- ./third_party/cmocka/cmocka.h.orig 2024-03-26 10:23:03.378410042 +0100 ++++ ./third_party/cmocka/cmocka.h 2024-03-26 10:24:51.526922405 +0100 +@@ -14,6 +14,11 @@ + * See the License for the specific language governing permissions and + * limitations under the License. + */ ++ ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #ifndef CMOCKA_H_ + #define CMOCKA_H_ + +@@ -111,7 +114,7 @@ + ((LargestIntegralType)(value)) + + /* Smallest integral type capable of holding a pointer. */ +-#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) ++#if !defined(HAVE_UINTPTR_T) && !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) && !defined(__DEFINED_uintptr_t) + # if defined(_WIN32) + /* WIN32 is an ILP32 platform */ + typedef unsigned int uintptr_t; diff --git a/net-fs/samba/samba-4.18.10.ebuild b/net-fs/samba/samba-4.18.10.ebuild index aad41632fada..be5091996562 100644 --- a/net-fs/samba/samba-4.18.10.ebuild +++ b/net-fs/samba/samba-4.18.10.ebuild @@ -146,6 +146,7 @@ BDEPEND="${PYTHON_DEPS} PATCHES=( "${FILESDIR}"/${PN}-4.18.4-pam.patch "${FILESDIR}"/ldb-2.5.2-skip-wav-tevent-check.patch + "${FILESDIR}"/cmocka-config_h.patch ) CONFDIR="${FILESDIR}/4.4" diff --git a/net-fs/samba/samba-4.18.8.ebuild b/net-fs/samba/samba-4.18.8.ebuild index 8135362ec56e..6d1877fa6e7b 100644 --- a/net-fs/samba/samba-4.18.8.ebuild +++ b/net-fs/samba/samba-4.18.8.ebuild @@ -146,6 +146,7 @@ BDEPEND="${PYTHON_DEPS} PATCHES=( "${FILESDIR}"/${PN}-4.18.4-pam.patch "${FILESDIR}"/ldb-2.5.2-skip-wav-tevent-check.patch + "${FILESDIR}"/cmocka-config_h.patch ) CONFDIR="${FILESDIR}/4.4" diff --git a/net-fs/samba/samba-4.18.9.ebuild b/net-fs/samba/samba-4.18.9.ebuild index 66c20828dd28..50ed3dd522ab 100644 --- a/net-fs/samba/samba-4.18.9.ebuild +++ b/net-fs/samba/samba-4.18.9.ebuild @@ -146,6 +146,7 @@ BDEPEND="${PYTHON_DEPS} PATCHES=( "${FILESDIR}"/${PN}-4.18.4-pam.patch "${FILESDIR}"/ldb-2.5.2-skip-wav-tevent-check.patch + "${FILESDIR}"/cmocka-config_h.patch ) CONFDIR="${FILESDIR}/4.4" diff --git a/net-fs/samba/samba-4.19.4.ebuild b/net-fs/samba/samba-4.19.4.ebuild index 14523d446af3..9903c474ab38 100644 --- a/net-fs/samba/samba-4.19.4.ebuild +++ b/net-fs/samba/samba-4.19.4.ebuild @@ -146,6 +146,7 @@ BDEPEND="${PYTHON_DEPS} PATCHES=( "${FILESDIR}"/${PN}-4.18.4-pam.patch "${FILESDIR}"/ldb-2.5.2-skip-wav-tevent-check.patch + "${FILESDIR}"/cmocka-config_h.patch ) CONFDIR="${FILESDIR}/4.4"