From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1339583-garchives=archives.gentoo.org@lists.gentoo.org>
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 C0810158086
for <garchives@archives.gentoo.org>; Sun, 14 Nov 2021 14:41:58 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id E6A2D2BC056;
Sun, 14 Nov 2021 14:41:57 +0000 (UTC)
Received: from smtp.gentoo.org (dev.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 685062BC056
for <gentoo-commits@lists.gentoo.org>; Sun, 14 Nov 2021 14:41:57 +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 80CD43434E0
for <gentoo-commits@lists.gentoo.org>; Sun, 14 Nov 2021 14:41:56 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id E2F2A79
for <gentoo-commits@lists.gentoo.org>; Sun, 14 Nov 2021 14:41:54 +0000 (UTC)
From: "Keri Harris" <keri@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, "Keri Harris" <keri@gentoo.org>
Message-ID: <1636900837.96bc73a96fc6e2ee02319f97f46ce5c61579d362.keri@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.3.29-r1.ebuild
X-VCS-Directories: dev-lang/swi-prolog/
X-VCS-Committer: keri
X-VCS-Committer-Name: Keri Harris
X-VCS-Revision: 96bc73a96fc6e2ee02319f97f46ce5c61579d362
X-VCS-Branch: master
Date: Sun, 14 Nov 2021 14:41:54 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 13dcdbee-e6f9-4e3d-a74d-352fbc89973f
X-Archives-Hash: b5509b37daf79f208062f02a8a8e9eb2
commit: 96bc73a96fc6e2ee02319f97f46ce5c61579d362
Author: Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 14 14:40:10 2021 +0000
Commit: Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sun Nov 14 14:40:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96bc73a9
dev-lang/swi-prolog: link libswipl.so with split ncurses/tinfo libs
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Keri Harris <keri <AT> gentoo.org>
dev-lang/swi-prolog/swi-prolog-8.2.4-r3.ebuild | 2 +-
dev-lang/swi-prolog/swi-prolog-8.3.29-r1.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 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 2b6f4bef271d..a11d78960fa2 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
@@ -62,7 +62,7 @@ src_prepare() {
local ncurses_lib_flags=$(pkg-config --libs ncurses)
sed -i "/project(SWI-Prolog)/a set(CMAKE_REQUIRED_LIBRARIES \${CMAKE_REQUIRED_LIBRARIES} ${ncurses_lib_flags})" CMakeLists.txt || die
- sed -i "/project(SWI-Prolog)/a set(CMAKE_EXE_LINKER_FLAGS \"${ncurses_lib_flags} \${CMAKE_EXE_LINKER_FLAGS}\")" CMakeLists.txt || die
+ sed -i "s:\${CURSES_LIBRARIES}:${ncurses_lib_flags}:" src/CMakeLists.txt || die
cmake_src_prepare
}
diff --git a/dev-lang/swi-prolog/swi-prolog-8.3.29-r1.ebuild b/dev-lang/swi-prolog/swi-prolog-8.3.29-r1.ebuild
index a2ca0d2e06bb..469bc73ee6e5 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.3.29-r1.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.3.29-r1.ebuild
@@ -63,7 +63,7 @@ src_prepare() {
local ncurses_lib_flags=$(pkg-config --libs ncurses)
sed -i "/project(SWI-Prolog)/a set(CMAKE_REQUIRED_LIBRARIES \${CMAKE_REQUIRED_LIBRARIES} ${ncurses_lib_flags})" CMakeLists.txt || die
- sed -i "/project(SWI-Prolog)/a set(CMAKE_EXE_LINKER_FLAGS \"${ncurses_lib_flags} \${CMAKE_EXE_LINKER_FLAGS}\")" CMakeLists.txt || die
+ sed -i "s:\${CURSES_LIBRARIES}:${ncurses_lib_flags}:" src/CMakeLists.txt || die
cmake_src_prepare
}