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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CBF7D138335 for ; Sat, 20 Apr 2019 23:40:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CDEAAE089F; Sat, 20 Apr 2019 23:40:18 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A3D7AE0897 for ; Sat, 20 Apr 2019 23:40:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 396DD3420E4 for ; Sat, 20 Apr 2019 17:35:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A5200326 for ; Sat, 20 Apr 2019 17:35:23 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1555781717.7a98ed1ed020ce63dd299629d7d4a7827c2cdeef.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/nfs-utils/files/, net-fs/nfs-utils/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-fs/nfs-utils/files/nfs-utils-2.3.4_rc2-improved_res_querydomain_check.patch net-fs/nfs-utils/nfs-utils-2.3.3.ebuild X-VCS-Directories: net-fs/nfs-utils/ net-fs/nfs-utils/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 7a98ed1ed020ce63dd299629d7d4a7827c2cdeef X-VCS-Branch: master Date: Sat, 20 Apr 2019 17:35:23 +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: 8ae3bb4e-196f-4eb4-b485-9f9e3ac7f3a0 X-Archives-Hash: fa9ac2bece198097f1bc7e1f2af2bd66 commit: 7a98ed1ed020ce63dd299629d7d4a7827c2cdeef Author: Lars Wendler gentoo org> AuthorDate: Sat Apr 20 17:34:52 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Sat Apr 20 17:35:17 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a98ed1e net-fs/nfs-utils: Fixed build on musl Closes: https://bugs.gentoo.org/651080 Package-Manager: Portage-2.3.64, Repoman-2.3.12 Signed-off-by: Lars Wendler gentoo.org> ...-2.3.4_rc2-improved_res_querydomain_check.patch | 41 ++++++++++++++++++++++ net-fs/nfs-utils/nfs-utils-2.3.3.ebuild | 1 + 2 files changed, 42 insertions(+) diff --git a/net-fs/nfs-utils/files/nfs-utils-2.3.4_rc2-improved_res_querydomain_check.patch b/net-fs/nfs-utils/files/nfs-utils-2.3.4_rc2-improved_res_querydomain_check.patch new file mode 100644 index 00000000000..787a96fe89d --- /dev/null +++ b/net-fs/nfs-utils/files/nfs-utils-2.3.4_rc2-improved_res_querydomain_check.patch @@ -0,0 +1,41 @@ +From 4f91877bb313a35ade44d9dde1fd219035ba1fd9 Mon Sep 17 00:00:00 2001 +From: Patrick Steinhardt +Date: Wed, 27 Feb 2019 11:58:47 -0500 +Subject: [PATCH] configure.ac: more carefully detect availability of + res_querydomain(3) + +Since glibc 2.2, the function res_querydomain(3) is implemented as a +define to `__res_querydomain`. Due to this implementation detail, using +`AC_CHECK_LIB` with a symbol name of "res_querydomain" will cause a +linking failure and thus fail to detect its availability. This is why +right now, we try to detect availability of `__res_querydomain` instead. + +Unfortunately, this may break on other platforms where there is no +`__res_querydomain` but only the function without leading underscores. +To fix this, we can perform another `AC_CHECK_LIB([resolv], +[res_querydomain], ...)` call in case where the other one was not found +and only raise an error if both symbols weren't found. + +Signed-off-by: Patrick Steinhardt +Signed-off-by: Steve Dickson +--- + configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 4bf5aea..cb9d921 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -411,7 +411,8 @@ if test "$enable_gss" = yes; then + fi + + dnl libdnsidmap specific checks +-AC_CHECK_LIB([resolv], [__res_querydomain], , AC_MSG_ERROR(res_querydomain needed)) ++AC_CHECK_LIB([resolv], [__res_querydomain], , ++ AC_CHECK_LIB([resolv], [res_querydomain], , AC_MSG_ERROR(res_querydomain needed))) + + AC_ARG_ENABLE([ldap], + [AS_HELP_STRING([--disable-ldap],[Disable support for LDAP @<:default=detect@:>@])]) +-- +1.8.3.1 + diff --git a/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild b/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild index be66fe1e765..18852036dc2 100644 --- a/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild +++ b/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild @@ -68,6 +68,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.2.8-cross-build.patch "${FILESDIR}"/${PN}-2.3.2-junction_libs.patch "${FILESDIR}"/${PN}-2.3.2-no-werror.patch + "${FILESDIR}"/${PN}-2.3.4_rc2-improved_res_querydomain_check.patch #651080 ) src_prepare() {