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 3AC38158086 for ; Sun, 5 Dec 2021 03:26:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 73CD12BC017; Sun, 5 Dec 2021 03:26:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 50CB52BC017 for ; Sun, 5 Dec 2021 03:26:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7524134350D for ; Sun, 5 Dec 2021 03:26:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2AB541AE for ; Sun, 5 Dec 2021 03:26:28 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1638674780.83b70b6994c62a69b07bfaeffd1a6454fa37230e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/swi-prolog/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/swi-prolog/swi-prolog-8.2.4-r3.ebuild dev-lang/swi-prolog/swi-prolog-8.4.0.ebuild dev-lang/swi-prolog/swi-prolog-8.4.1.ebuild dev-lang/swi-prolog/swi-prolog-8.5.1.ebuild dev-lang/swi-prolog/swi-prolog-8.5.2.ebuild X-VCS-Directories: dev-lang/swi-prolog/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 83b70b6994c62a69b07bfaeffd1a6454fa37230e X-VCS-Branch: master Date: Sun, 5 Dec 2021 03:26:28 +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: 9cf942a3-f87d-493d-8127-04b7133f6ec2 X-Archives-Hash: 5a5f3809858ab601bea9850917694801 commit: 83b70b6994c62a69b07bfaeffd1a6454fa37230e Author: Sam James gentoo org> AuthorDate: Sun Dec 5 03:25:16 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sun Dec 5 03:26:20 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83b70b69 dev-lang/swi-prolog: fix pkg-config call Signed-off-by: Sam James gentoo.org> dev-lang/swi-prolog/swi-prolog-8.2.4-r3.ebuild | 6 ++++-- dev-lang/swi-prolog/swi-prolog-8.4.0.ebuild | 6 ++++-- dev-lang/swi-prolog/swi-prolog-8.4.1.ebuild | 6 ++++-- dev-lang/swi-prolog/swi-prolog-8.5.1.ebuild | 6 ++++-- dev-lang/swi-prolog/swi-prolog-8.5.2.ebuild | 6 ++++-- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dev-lang/swi-prolog/swi-prolog-8.2.4-r3.ebuild b/dev-lang/swi-prolog/swi-prolog-8.2.4-r3.ebuild index a11d78960fa2..f00cd2215eae 100644 --- a/dev-lang/swi-prolog/swi-prolog-8.2.4-r3.ebuild +++ b/dev-lang/swi-prolog/swi-prolog-8.2.4-r3.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake desktop xdg-utils flag-o-matic +inherit cmake desktop xdg-utils flag-o-matic toolchain-funcs PATCHSET_VER="0" @@ -49,6 +49,8 @@ DEPEND="${RDEPEND} X? ( x11-base/xorg-proto ) java? ( test? ( =dev-java/junit-3.8* ) )" +BDEPEND="virtual/pkgconfig" + S="${WORKDIR}/swipl-${PV}" src_prepare() { @@ -60,7 +62,7 @@ src_prepare() { -e "s|\(SWIPL_INSTALL_CMAKE_CONFIG_DIR\) lib/|\1 $(get_libdir)/|" \ -i CMakeLists.txt || die - local ncurses_lib_flags=$(pkg-config --libs ncurses) + local ncurses_lib_flags=$($(tc-getPKG_CONFIG) --libs ncurses) sed -i "/project(SWI-Prolog)/a set(CMAKE_REQUIRED_LIBRARIES \${CMAKE_REQUIRED_LIBRARIES} ${ncurses_lib_flags})" CMakeLists.txt || die sed -i "s:\${CURSES_LIBRARIES}:${ncurses_lib_flags}:" src/CMakeLists.txt || die diff --git a/dev-lang/swi-prolog/swi-prolog-8.4.0.ebuild b/dev-lang/swi-prolog/swi-prolog-8.4.0.ebuild index e6d102021369..f00dfe509d7c 100644 --- a/dev-lang/swi-prolog/swi-prolog-8.4.0.ebuild +++ b/dev-lang/swi-prolog/swi-prolog-8.4.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake desktop xdg-utils flag-o-matic +inherit cmake desktop xdg-utils flag-o-matic toolchain-funcs PATCHSET_VER="0" @@ -49,6 +49,8 @@ DEPEND="${RDEPEND} X? ( x11-base/xorg-proto ) java? ( test? ( =dev-java/junit-3.8* ) )" +BDEPEND="virtual/pkgconfig" + S="${WORKDIR}/swipl-${PV}" src_prepare() { @@ -60,7 +62,7 @@ src_prepare() { -e "s|\(SWIPL_INSTALL_CMAKE_CONFIG_DIR\) lib/|\1 $(get_libdir)/|" \ -i CMakeLists.txt || die - local ncurses_lib_flags=$(pkg-config --libs ncurses) + local ncurses_lib_flags=$($(tc-getPKG_CONFIG) --libs ncurses) sed -i "/project(SWI-Prolog)/a set(CMAKE_REQUIRED_LIBRARIES \${CMAKE_REQUIRED_LIBRARIES} ${ncurses_lib_flags})" CMakeLists.txt || die sed -i "s:\${CURSES_LIBRARIES}:${ncurses_lib_flags}:" src/CMakeLists.txt || die diff --git a/dev-lang/swi-prolog/swi-prolog-8.4.1.ebuild b/dev-lang/swi-prolog/swi-prolog-8.4.1.ebuild index e6d102021369..f00dfe509d7c 100644 --- a/dev-lang/swi-prolog/swi-prolog-8.4.1.ebuild +++ b/dev-lang/swi-prolog/swi-prolog-8.4.1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake desktop xdg-utils flag-o-matic +inherit cmake desktop xdg-utils flag-o-matic toolchain-funcs PATCHSET_VER="0" @@ -49,6 +49,8 @@ DEPEND="${RDEPEND} X? ( x11-base/xorg-proto ) java? ( test? ( =dev-java/junit-3.8* ) )" +BDEPEND="virtual/pkgconfig" + S="${WORKDIR}/swipl-${PV}" src_prepare() { @@ -60,7 +62,7 @@ src_prepare() { -e "s|\(SWIPL_INSTALL_CMAKE_CONFIG_DIR\) lib/|\1 $(get_libdir)/|" \ -i CMakeLists.txt || die - local ncurses_lib_flags=$(pkg-config --libs ncurses) + local ncurses_lib_flags=$($(tc-getPKG_CONFIG) --libs ncurses) sed -i "/project(SWI-Prolog)/a set(CMAKE_REQUIRED_LIBRARIES \${CMAKE_REQUIRED_LIBRARIES} ${ncurses_lib_flags})" CMakeLists.txt || die sed -i "s:\${CURSES_LIBRARIES}:${ncurses_lib_flags}:" src/CMakeLists.txt || die diff --git a/dev-lang/swi-prolog/swi-prolog-8.5.1.ebuild b/dev-lang/swi-prolog/swi-prolog-8.5.1.ebuild index 671e98da2c75..01e65b4777f1 100644 --- a/dev-lang/swi-prolog/swi-prolog-8.5.1.ebuild +++ b/dev-lang/swi-prolog/swi-prolog-8.5.1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake desktop xdg-utils flag-o-matic +inherit cmake desktop xdg-utils flag-o-matic toolchain-funcs PATCHSET_VER="0" @@ -49,6 +49,8 @@ DEPEND="${RDEPEND} X? ( x11-base/xorg-proto ) java? ( test? ( =dev-java/junit-3.8* ) )" +BDEPEND="virtual/pkgconfig" + S="${WORKDIR}/swipl-${PV}" src_prepare() { @@ -60,7 +62,7 @@ src_prepare() { -e "s|\(SWIPL_INSTALL_CMAKE_CONFIG_DIR\) lib/|\1 $(get_libdir)/|" \ -i CMakeLists.txt || die - local ncurses_lib_flags=$(pkg-config --libs ncurses) + local ncurses_lib_flags=$($(tc-getPKG_CONFIG) --libs ncurses) sed -i "/project(SWI-Prolog)/a set(CMAKE_REQUIRED_LIBRARIES \${CMAKE_REQUIRED_LIBRARIES} ${ncurses_lib_flags})" CMakeLists.txt || die sed -i "s:\${CURSES_LIBRARIES}:${ncurses_lib_flags}:" src/CMakeLists.txt || die diff --git a/dev-lang/swi-prolog/swi-prolog-8.5.2.ebuild b/dev-lang/swi-prolog/swi-prolog-8.5.2.ebuild index 671e98da2c75..01e65b4777f1 100644 --- a/dev-lang/swi-prolog/swi-prolog-8.5.2.ebuild +++ b/dev-lang/swi-prolog/swi-prolog-8.5.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake desktop xdg-utils flag-o-matic +inherit cmake desktop xdg-utils flag-o-matic toolchain-funcs PATCHSET_VER="0" @@ -49,6 +49,8 @@ DEPEND="${RDEPEND} X? ( x11-base/xorg-proto ) java? ( test? ( =dev-java/junit-3.8* ) )" +BDEPEND="virtual/pkgconfig" + S="${WORKDIR}/swipl-${PV}" src_prepare() { @@ -60,7 +62,7 @@ src_prepare() { -e "s|\(SWIPL_INSTALL_CMAKE_CONFIG_DIR\) lib/|\1 $(get_libdir)/|" \ -i CMakeLists.txt || die - local ncurses_lib_flags=$(pkg-config --libs ncurses) + local ncurses_lib_flags=$($(tc-getPKG_CONFIG) --libs ncurses) sed -i "/project(SWI-Prolog)/a set(CMAKE_REQUIRED_LIBRARIES \${CMAKE_REQUIRED_LIBRARIES} ${ncurses_lib_flags})" CMakeLists.txt || die sed -i "s:\${CURSES_LIBRARIES}:${ncurses_lib_flags}:" src/CMakeLists.txt || die