commit: 956c96ce1bac9fcd9e792f9d64215da236d282f9 Author: Jan Ziak <0xe2.0x9a.0x9b <AT> gmail <DOT> com> AuthorDate: Fri Sep 4 20:56:02 2020 +0000 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> CommitDate: Fri Sep 18 19:22:37 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=956c96ce
net-dns/bind-9.16.6-r2: Revbump, USE=ldap on multilib (bug #739062) Closes: https://bugs.gentoo.org/739062 Signed-off-by: Jan Ziak <0xe2.0x9a.0x9b <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/17419 Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> .../bind/{bind-9.16.6-r1.ebuild => bind-9.16.6-r2.ebuild} | 2 ++ .../bind/files/ldap-library-path-on-multilib-machines.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/net-dns/bind/bind-9.16.6-r1.ebuild b/net-dns/bind/bind-9.16.6-r2.ebuild similarity index 99% rename from net-dns/bind/bind-9.16.6-r1.ebuild rename to net-dns/bind/bind-9.16.6-r2.ebuild index 4cce9cdc72a..4f12a967f86 100644 --- a/net-dns/bind/bind-9.16.6-r1.ebuild +++ b/net-dns/bind/bind-9.16.6-r2.ebuild @@ -87,6 +87,8 @@ PATCHES=( # should fix https://bugs.gentoo.org/741162 taken from: # https://gitlab.isc.org/isc-projects/bind9/-/merge_requests/4073 "${FILESDIR}/bind-9.16.6-bug-741162.patch" + + "${FILESDIR}/ldap-library-path-on-multilib-machines.patch" ) # bug 479092, requires networking diff --git a/net-dns/bind/files/ldap-library-path-on-multilib-machines.patch b/net-dns/bind/files/ldap-library-path-on-multilib-machines.patch new file mode 100644 index 00000000000..5286c72f11b --- /dev/null +++ b/net-dns/bind/files/ldap-library-path-on-multilib-machines.patch @@ -0,0 +1,13 @@ +diff --git a/contrib/dlz/config.dlz.in b/contrib/dlz/config.dlz.in +index f769cf1..721d480 100644 +--- a/contrib/dlz/config.dlz.in ++++ b/contrib/dlz/config.dlz.in +@@ -396,7 +396,7 @@ case "$use_dlz_ldap" in + *) + DLZ_ADD_DRIVER(LDAP, dlz_ldap_driver, + [-I$use_dlz_ldap/include], +- [-L$use_dlz_ldap/lib -lldap -llber]) ++ [-lldap -llber]) + + AC_MSG_RESULT( + [using LDAP from $use_dlz_ldap/lib and $use_dlz_ldap/include])
