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 CC602138334 for ; Fri, 22 Mar 2019 10:05:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D855FE09C9; Fri, 22 Mar 2019 10:05:38 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 987EFE09C9 for ; Fri, 22 Mar 2019 10:05:38 +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 6AEDC335CF3 for ; Fri, 22 Mar 2019 10:05:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1238F56A for ; Fri, 22 Mar 2019 10:05:36 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1553249126.45d7b4d6d7c5e9f2ca1d742a53072f3a92cb5a91.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/files/, dev-lang/ocaml/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/ocaml/files/ocaml-4.04.2-tinfo.patch dev-lang/ocaml/ocaml-4.04.2-r1.ebuild dev-lang/ocaml/ocaml-4.05.0-r1.ebuild X-VCS-Directories: dev-lang/ocaml/ dev-lang/ocaml/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 45d7b4d6d7c5e9f2ca1d742a53072f3a92cb5a91 X-VCS-Branch: master Date: Fri, 22 Mar 2019 10:05:36 +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: f95c5ff6-f011-49ae-baa1-08f49815a597 X-Archives-Hash: 45f620064f585d8e6a0f89e20a40fad5 commit: 45d7b4d6d7c5e9f2ca1d742a53072f3a92cb5a91 Author: Lars Wendler gentoo org> AuthorDate: Fri Mar 22 09:46:07 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Fri Mar 22 10:05:26 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45d7b4d6 dev-lang/ocaml: Fixed build with sys-libs/ncurses[tinfo] Closes: https://bugs.gentoo.org/459512 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Lars Wendler gentoo.org> dev-lang/ocaml/files/ocaml-4.04.2-tinfo.patch | 13 +++++++++++++ dev-lang/ocaml/ocaml-4.04.2-r1.ebuild | 3 ++- dev-lang/ocaml/ocaml-4.05.0-r1.ebuild | 3 ++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dev-lang/ocaml/files/ocaml-4.04.2-tinfo.patch b/dev-lang/ocaml/files/ocaml-4.04.2-tinfo.patch new file mode 100644 index 00000000000..ceeb8299109 --- /dev/null +++ b/dev-lang/ocaml/files/ocaml-4.04.2-tinfo.patch @@ -0,0 +1,13 @@ +https://bugs.gentoo.org/459512 + +--- ocaml-4.04.2/configure ++++ ocaml-4.04.2/configure +@@ -1095,7 +1095,7 @@ + # For the terminfo module + + if test "$with_curses" = "yes"; then +- for libs in "" "-lcurses" "-ltermcap" "-lcurses -ltermcap" "-lncurses"; do ++ for libs in "" "-ltinfo" "-lcurses" "-ltermcap" "-lcurses -ltermcap" "-lncurses"; do + if sh ./hasgot $libs tgetent tgetstr tgetnum tputs; then + inf "termcap functions found (with libraries '$libs')" + echo "#define HAS_TERMCAP" >> s.h diff --git a/dev-lang/ocaml/ocaml-4.04.2-r1.ebuild b/dev-lang/ocaml/ocaml-4.04.2-r1.ebuild index f790ab2d1cd..60c56bef2e4 100644 --- a/dev-lang/ocaml/ocaml-4.04.2-r1.ebuild +++ b/dev-lang/ocaml/ocaml-4.04.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -43,6 +43,7 @@ pkg_setup() { src_prepare() { EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" + epatch "${FILESDIR}/${PN}-4.04.2-tinfo.patch" #459512 } src_configure() { diff --git a/dev-lang/ocaml/ocaml-4.05.0-r1.ebuild b/dev-lang/ocaml/ocaml-4.05.0-r1.ebuild index f0a79f5e329..16b090dacbf 100644 --- a/dev-lang/ocaml/ocaml-4.05.0-r1.ebuild +++ b/dev-lang/ocaml/ocaml-4.05.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -44,6 +44,7 @@ pkg_setup() { src_prepare() { EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" + epatch "${FILESDIR}/${PN}-4.04.2-tinfo.patch" #459512 } src_configure() {