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 04762138334 for ; Fri, 6 Dec 2019 17:27:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 387D2E079E; Fri, 6 Dec 2019 17:27:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 02D98E079E for ; Fri, 6 Dec 2019 17:27:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 9F21634D544 for ; Fri, 6 Dec 2019 17:27:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 30DAA778 for ; Fri, 6 Dec 2019 17:27:18 +0000 (UTC) From: "Brian Evans" 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" Message-ID: <1575653230.52e20370c0d974fb1452c29d755b738b6a8b0523.grknight@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/php/, dev-lang/php/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/php/files/php-iodbc-header-location.patch dev-lang/php/php-7.4.0.ebuild X-VCS-Directories: dev-lang/php/files/ dev-lang/php/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 52e20370c0d974fb1452c29d755b738b6a8b0523 X-VCS-Branch: master Date: Fri, 6 Dec 2019 17:27:18 +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: be7afbbe-76b1-43ed-ac1e-27a495373994 X-Archives-Hash: 65e54090f3ce072019778b102bb5a7f2 commit: 52e20370c0d974fb1452c29d755b738b6a8b0523 Author: Brian Evans gentoo org> AuthorDate: Fri Dec 6 17:26:42 2019 +0000 Commit: Brian Evans gentoo org> CommitDate: Fri Dec 6 17:27:10 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52e20370 dev-lang/php: Fix locating iODBC for use with PDO Closes: https://bugs.gentoo.org/702106 Package-Manager: Portage-2.3.80, Repoman-2.3.19 Signed-off-by: Brian Evans gentoo.org> dev-lang/php/files/php-iodbc-header-location.patch | 14 ++++++++++++ dev-lang/php/php-7.4.0.ebuild | 26 +++++++++++++++++----- 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/dev-lang/php/files/php-iodbc-header-location.patch b/dev-lang/php/files/php-iodbc-header-location.patch new file mode 100644 index 00000000000..e34f09b6ec8 --- /dev/null +++ b/dev-lang/php/files/php-iodbc-header-location.patch @@ -0,0 +1,14 @@ +diff -aurN a/ext/pdo_odbc/config.m4 b/ext/pdo_odbc/config.m4 +--- a/ext/pdo_odbc/config.m4 2019-11-26 15:13:39.000000000 -0500 ++++ b/ext/pdo_odbc/config.m4 2019-12-06 10:39:56.296658492 -0500 +@@ -85,6 +85,10 @@ + PDO_ODBC_LIBDIR="$pdo_odbc_def_libdir" + fi + ++ if test "$pdo_odbc_def_lib" = "iodbc" ; then ++ PDO_ODBC_INCDIR="$PDO_ODBC_INCDIR/iodbc" ++ fi ++ + AC_MSG_RESULT([$pdo_odbc_flavour + libs $PDO_ODBC_LIBDIR, + headers $PDO_ODBC_INCDIR]) diff --git a/dev-lang/php/php-7.4.0.ebuild b/dev-lang/php/php-7.4.0.ebuild index 9f8615b21e6..fbf13a93f6b 100644 --- a/dev-lang/php/php-7.4.0.ebuild +++ b/dev-lang/php/php-7.4.0.ebuild @@ -150,6 +150,8 @@ BDEPEND="virtual/pkgconfig" PHP_MV="$(ver_cut 1)" +PATCHES=( "${FILESDIR}/php-iodbc-header-location.patch" ) + php_install_ini() { local phpsapi="${1}" @@ -358,10 +360,25 @@ src_configure() { fi # ODBC support - our_conf+=( - $(use_with odbc unixODBC "${EPREFIX}/usr") - $(use_with iodbc) - ) + if use odbc && use iodbc ; then + our_conf+=( + --without-unixODBC + --with-iodbc + $(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr") + ) + elif use odbc ; then + our_conf+=( + --with-unixODBC="${EPREFIX}/usr" + --without-iodbc + $(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr") + ) + else + our_conf+=( + --without-unixODBC + --without-iodbc + --without-pdo-odbc + ) + fi # Oracle support our_conf+=( $(use_with oci8-instant-client oci8) ) @@ -374,7 +391,6 @@ src_configure() { $(use_with postgres pdo-pgsql) $(use_with sqlite pdo-sqlite) $(use_with firebird pdo-firebird "${EPREFIX}/usr") - $(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr") $(use_with oci8-instant-client pdo-oci) ) fi