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 591F7158089 for ; Wed, 18 Oct 2023 04:26:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9D45E2BC038; Wed, 18 Oct 2023 04:26:16 +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 814232BC038 for ; Wed, 18 Oct 2023 04:26:16 +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 7B899335CDF for ; Wed, 18 Oct 2023 04:26:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D6344128C for ; Wed, 18 Oct 2023 04:26:13 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1697603158.0c7dd1f7d5dbf2e129b50b870a6f208a724cbaaf.zmedico@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/calibre/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/calibre/calibre-5.44.0-r2.ebuild X-VCS-Directories: app-text/calibre/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 0c7dd1f7d5dbf2e129b50b870a6f208a724cbaaf X-VCS-Branch: master Date: Wed, 18 Oct 2023 04:26:13 +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: c1a02137-e555-4896-9fb3-eecbd373a0c5 X-Archives-Hash: 4f1fb150b4b8c486466d9812c40e67c4 commit: 0c7dd1f7d5dbf2e129b50b870a6f208a724cbaaf Author: Eli Schwartz gmail com> AuthorDate: Mon Oct 2 05:35:50 2023 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Oct 18 04:25:58 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c7dd1f7 app-text/calibre: avoid setting useless variables at install time The install process does not rerun compiles, so setting variables there is useless and does nothing. They didn't have any effect on src_compile all this time, which means that whatever they tried to fix clearly was not an issue. ;) That being said, there are two things going on here: - OVERRIDE_CFLAGS is used by the calibre build system in addition to CFLAGS, so it is not actually necessary to override it, and using both, means using -Wall and suchlike so respecting it seems reasonable - the calibre build system respects either $PATH or $QMAKE to find the qmake program. Instead of using the former method in src_compile and the latter method in src_install, just use the latter method in src_compile and avoid munging $PATH. Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Zac Medico gentoo.org> app-text/calibre/calibre-5.44.0-r2.ebuild | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/app-text/calibre/calibre-5.44.0-r2.ebuild b/app-text/calibre/calibre-5.44.0-r2.ebuild index 759f990001f0..598bb98f4356 100644 --- a/app-text/calibre/calibre-5.44.0-r2.ebuild +++ b/app-text/calibre/calibre-5.44.0-r2.ebuild @@ -183,8 +183,9 @@ src_compile() { # bug 821871 local MY_LIBDIR="${ESYSROOT}/usr/$(get_libdir)" export FT_LIB_DIR="${MY_LIBDIR}" HUNSPELL_LIB_DIR="${MY_LIBDIR}" PODOFO_LIB_DIR="${MY_LIBDIR}" + export QMAKE="$(qt5_get_bindir)/qmake" - PATH="${T}/bin:$(qt5_get_bindir):${PATH}" ${EPYTHON} setup.py build || die + ${EPYTHON} setup.py build || die } src_test() { @@ -202,8 +203,6 @@ src_test() { } src_install() { - export QMAKE="$(qt5_get_bindir)/qmake" - # Bug #352625 - Some LANGUAGE values can trigger the following ValueError: # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale # return _parse_localename(localename) @@ -219,9 +218,6 @@ src_install() { export CALIBRE_CONFIG_DIRECTORY="${HOME}/.config/calibre" mkdir -p "${CALIBRE_CONFIG_DIRECTORY}" || die - tc-export CC CXX - # Bug #334243 - respect LDFLAGS when building extensions - export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS" local libdir=$(get_libdir) [[ -n $libdir ]] || die "get_libdir returned an empty string"