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 D6829158008 for ; Mon, 12 Jun 2023 17:51:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2516FE0880; Mon, 12 Jun 2023 17:51:12 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 088F6E0880 for ; Mon, 12 Jun 2023 17:51:12 +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 2621433B864 for ; Mon, 12 Jun 2023 17:51:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8EA718DC for ; Mon, 12 Jun 2023 17:51:09 +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: <1686592253.d1e7521fb883fa4dd2d65487fdffda4903bd0d4a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/samba/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-fs/samba/samba-4.16.10.ebuild net-fs/samba/samba-4.16.8.ebuild net-fs/samba/samba-4.17.8.ebuild net-fs/samba/samba-4.18.3.ebuild X-VCS-Directories: net-fs/samba/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d1e7521fb883fa4dd2d65487fdffda4903bd0d4a X-VCS-Branch: master Date: Mon, 12 Jun 2023 17:51:09 +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: 27edccf1-e74e-43f6-8bc9-d96bfa80e9fa X-Archives-Hash: 4ce76aca3cb259834750eca610102cbb commit: d1e7521fb883fa4dd2d65487fdffda4903bd0d4a Author: Sam James gentoo org> AuthorDate: Mon Jun 12 17:50:46 2023 +0000 Commit: Sam James gentoo org> CommitDate: Mon Jun 12 17:50:53 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1e7521f net-fs/samba: use dummy .pc file for llvm-libunwind LLVM still doesn't provide any... Closes: https://bugs.gentoo.org/874633 Signed-off-by: Sam James gentoo.org> net-fs/samba/samba-4.16.10.ebuild | 19 +++++++++++++++++++ net-fs/samba/samba-4.16.8.ebuild | 19 +++++++++++++++++++ net-fs/samba/samba-4.17.8.ebuild | 19 +++++++++++++++++++ net-fs/samba/samba-4.18.3.ebuild | 19 +++++++++++++++++++ 4 files changed, 76 insertions(+) diff --git a/net-fs/samba/samba-4.16.10.ebuild b/net-fs/samba/samba-4.16.10.ebuild index 91b5cf463acd..258c37134aeb 100644 --- a/net-fs/samba/samba-4.16.10.ebuild +++ b/net-fs/samba/samba-4.16.10.ebuild @@ -233,6 +233,25 @@ multilib_src_configure() { bundled_libs="cmocka,${bundled_libs}" fi + # bug #874633 + if use llvm-libunwind ; then + mkdir -p "${T}"/${ABI}/pkgconfig || die + + local -x PKG_CONFIG_PATH="${T}/${ABI}/pkgconfig:${PKG_CONFIG_PATH}" + + cat <<-EOF > "${T}"/${ABI}/pkgconfig/libunwind-generic.pc || die + exec_prefix=\${prefix} + libdir=/usr/$(get_libdir) + includedir=\${prefix}/include + + Name: libunwind-generic + Description: libunwind generic library + Version: 1.70 + Libs: -L\${libdir} -lunwind + Cflags: -I\${includedir} + EOF + fi + local myconf=( --enable-fhs --sysconfdir="${EPREFIX}/etc" diff --git a/net-fs/samba/samba-4.16.8.ebuild b/net-fs/samba/samba-4.16.8.ebuild index 2f33091b53fb..3cefea75dfa9 100644 --- a/net-fs/samba/samba-4.16.8.ebuild +++ b/net-fs/samba/samba-4.16.8.ebuild @@ -233,6 +233,25 @@ multilib_src_configure() { bundled_libs="cmocka,${bundled_libs}" fi + # bug #874633 + if use llvm-libunwind ; then + mkdir -p "${T}"/${ABI}/pkgconfig || die + + local -x PKG_CONFIG_PATH="${T}/${ABI}/pkgconfig:${PKG_CONFIG_PATH}" + + cat <<-EOF > "${T}"/${ABI}/pkgconfig/libunwind-generic.pc || die + exec_prefix=\${prefix} + libdir=/usr/$(get_libdir) + includedir=\${prefix}/include + + Name: libunwind-generic + Description: libunwind generic library + Version: 1.70 + Libs: -L\${libdir} -lunwind + Cflags: -I\${includedir} + EOF + fi + local myconf=( --enable-fhs --sysconfdir="${EPREFIX}/etc" diff --git a/net-fs/samba/samba-4.17.8.ebuild b/net-fs/samba/samba-4.17.8.ebuild index 64dc7ce9bf2c..3c6e492f5d8a 100644 --- a/net-fs/samba/samba-4.17.8.ebuild +++ b/net-fs/samba/samba-4.17.8.ebuild @@ -230,6 +230,25 @@ multilib_src_configure() { bundled_libs="cmocka,${bundled_libs}" fi + # bug #874633 + if use llvm-libunwind ; then + mkdir -p "${T}"/${ABI}/pkgconfig || die + + local -x PKG_CONFIG_PATH="${T}/${ABI}/pkgconfig:${PKG_CONFIG_PATH}" + + cat <<-EOF > "${T}"/${ABI}/pkgconfig/libunwind-generic.pc || die + exec_prefix=\${prefix} + libdir=/usr/$(get_libdir) + includedir=\${prefix}/include + + Name: libunwind-generic + Description: libunwind generic library + Version: 1.70 + Libs: -L\${libdir} -lunwind + Cflags: -I\${includedir} + EOF + fi + local myconf=( --enable-fhs --sysconfdir="${EPREFIX}/etc" diff --git a/net-fs/samba/samba-4.18.3.ebuild b/net-fs/samba/samba-4.18.3.ebuild index dd6ebd54b02e..5ad2cad9375e 100644 --- a/net-fs/samba/samba-4.18.3.ebuild +++ b/net-fs/samba/samba-4.18.3.ebuild @@ -230,6 +230,25 @@ multilib_src_configure() { bundled_libs="cmocka,${bundled_libs}" fi + # bug #874633 + if use llvm-libunwind ; then + mkdir -p "${T}"/${ABI}/pkgconfig || die + + local -x PKG_CONFIG_PATH="${T}/${ABI}/pkgconfig:${PKG_CONFIG_PATH}" + + cat <<-EOF > "${T}"/${ABI}/pkgconfig/libunwind-generic.pc || die + exec_prefix=\${prefix} + libdir=/usr/$(get_libdir) + includedir=\${prefix}/include + + Name: libunwind-generic + Description: libunwind generic library + Version: 1.70 + Libs: -L\${libdir} -lunwind + Cflags: -I\${includedir} + EOF + fi + local myconf=( --enable-fhs --sysconfdir="${EPREFIX}/etc"