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 BCF9315817D for ; Tue, 4 Jun 2024 19:10:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 00E99E2BC1; Tue, 4 Jun 2024 19:10:51 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C956AE2BC1 for ; Tue, 4 Jun 2024 19:10:50 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B349533BEED for ; Tue, 4 Jun 2024 19:10:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 167CC1BFC for ; Tue, 4 Jun 2024 19:10:48 +0000 (UTC) From: "Michael Orlitzky" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" Message-ID: <1717528151.a471f99343590c267a67ef6c973b5e3d51938921.mjo@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/php/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/php/php-8.3.7.ebuild X-VCS-Directories: dev-lang/php/ X-VCS-Committer: mjo X-VCS-Committer-Name: Michael Orlitzky X-VCS-Revision: a471f99343590c267a67ef6c973b5e3d51938921 X-VCS-Branch: master Date: Tue, 4 Jun 2024 19:10:48 +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: 8445c3ff-2e8b-4db8-b65a-714010c2c1d5 X-Archives-Hash: 611cfa0429598c13299faebaeef9796d commit: a471f99343590c267a67ef6c973b5e3d51938921 Author: Michael Orlitzky gentoo org> AuthorDate: Tue Jun 4 18:18:18 2024 +0000 Commit: Michael Orlitzky gentoo org> CommitDate: Tue Jun 4 19:09:11 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a471f993 dev-lang/php: avoid the iodbc patch The patch _is_ simpler, but with enough hacks, we can convince the build system to use the right paths without patching. Signed-off-by: Michael Orlitzky gentoo.org> dev-lang/php/php-8.3.7.ebuild | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/dev-lang/php/php-8.3.7.ebuild b/dev-lang/php/php-8.3.7.ebuild index 1ccb66ce8a52..8bb61d05fe7b 100644 --- a/dev-lang/php/php-8.3.7.ebuild +++ b/dev-lang/php/php-8.3.7.ebuild @@ -144,10 +144,6 @@ BDEPEND="virtual/pkgconfig" PHP_MV="$(ver_cut 1)" -PATCHES=( - "${FILESDIR}/php-iodbc-header-location.patch" -) - # ARM/Windows functions (bug 923335) QA_CONFIG_IMPL_DECL_SKIP=( __crc32d @@ -418,10 +414,22 @@ src_configure() { # ODBC support if use odbc && use iodbc ; then + # Obtain the correct -l and -I flags for the actual build from + # pkg-config. We use the "generic" library type to avoid the + # (wrong) hard-coded include dir for iodbc. + # + # We set the pdo_odbc_def_incdir variable because the + # ./configure script checks for the headers using "test -f" and + # ignores your CFLAGS... and pdo_odbc_def_libdir prevents the + # build system from appending a nonsense -L flag. + local iodbc_ldflags=$(pkg-config --libs libiodbc) + local iodbc_cflags=$(pkg-config --cflags libiodbc) our_conf+=( + pdo_odbc_def_libdir="${EPREFIX}/usr/$(get_libdir)" + pdo_odbc_def_incdir="${EPREFIX}/usr/include/iodbc" --without-unixODBC --with-iodbc - $(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr") + $(use_with pdo pdo-odbc "generic,,iodbc,${iodbc_ldlags},${iodbc_cflags}") ) elif use odbc ; then our_conf+=(