From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-963941-garchives=archives.gentoo.org@lists.gentoo.org> 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 B3735139694 for <garchives@archives.gentoo.org>; Sat, 29 Jul 2017 01:13:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8CCD31FC187; Sat, 29 Jul 2017 01:13:31 +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 6A2711FC187 for <gentoo-commits@lists.gentoo.org>; Sat, 29 Jul 2017 01:13:31 +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 E1AAE341A55 for <gentoo-commits@lists.gentoo.org>; Sat, 29 Jul 2017 01:13:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 889C974B9 for <gentoo-commits@lists.gentoo.org>; Sat, 29 Jul 2017 01:13:28 +0000 (UTC) From: "Brian Evans" <grknight@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" <grknight@gentoo.org> Message-ID: <1501290796.1fc8fcc82ad4eb28e68a5fa70bf8ea683e9643f6.grknight@gentoo> Subject: [gentoo-commits] proj/mysql-extras:master commit in: / X-VCS-Repository: proj/mysql-extras X-VCS-Files: 20025_all_mariadb-10.2.6-gssapi-detect.patch X-VCS-Directories: / X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 1fc8fcc82ad4eb28e68a5fa70bf8ea683e9643f6 X-VCS-Branch: master Date: Sat, 29 Jul 2017 01:13:28 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f1743fae-474f-4a4c-9a84-296336f8fe60 X-Archives-Hash: 5623585f899d1edc6023bfa1ca9aa0e1 commit: 1fc8fcc82ad4eb28e68a5fa70bf8ea683e9643f6 Author: Brian Evans <grknight <AT> gentoo <DOT> org> AuthorDate: Sat Jul 29 01:13:16 2017 +0000 Commit: Brian Evans <grknight <AT> gentoo <DOT> org> CommitDate: Sat Jul 29 01:13:16 2017 +0000 URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=1fc8fcc8 20025: Additionally add -krb5 to pkg-config part2 20025_all_mariadb-10.2.6-gssapi-detect.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/20025_all_mariadb-10.2.6-gssapi-detect.patch b/20025_all_mariadb-10.2.6-gssapi-detect.patch index 7687e3d..8eec8d2 100644 --- a/20025_all_mariadb-10.2.6-gssapi-detect.patch +++ b/20025_all_mariadb-10.2.6-gssapi-detect.patch @@ -7,11 +7,11 @@ diff -aurN a/libmariadb/cmake/FindGSSAPI.cmake b/libmariadb/cmake/FindGSSAPI.cma + find_package(PkgConfig) + IF(PKG_CONFIG_FOUND) -+ pkg_search_module(GSSAPI mit-krb5-gssapi mit-krb5) ++ pkg_check_modules(GSSAPI mit-krb5-gssapi mit-krb5) + IF(GSSAPI_FOUND) + set(GSSAPI_FLAVOR "MIT") + ELSE() -+ pkg_search_module(GSSAPI heimdal-gssapi heimdal-krb5) ++ pkg_check_modules(GSSAPI heimdal-gssapi heimdal-krb5) + IF(GSSAPI_FOUND) + set(GSSAPI_FLAVOR "HEIMDAL") + ENDIF() @@ -40,11 +40,11 @@ diff -aurN a/plugin/auth_gssapi/cmake/FindGSSAPI.cmake b/plugin/auth_gssapi/cmak + find_package(PkgConfig) + IF(PKG_CONFIG_FOUND) -+ pkg_search_module(GSSAPI mit-krb5-gssapi mit-krb5) ++ pkg_check_modules(GSSAPI mit-krb5-gssapi mit-krb5) + IF(GSSAPI_FOUND) + set(GSSAPI_FLAVOR "MIT") + ELSE() -+ pkg_search_module(GSSAPI heimdal-gssapi heimdal-krb5) ++ pkg_check_modules(GSSAPI heimdal-gssapi heimdal-krb5) + IF(GSSAPI_FOUND) + set(GSSAPI_FLAVOR "HEIMDAL") + ENDIF()