summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2019-03-22 10:46:07 +0100
committerLars Wendler <polynomial-c@gentoo.org>2019-03-22 11:05:26 +0100
commit45d7b4d6d7c5e9f2ca1d742a53072f3a92cb5a91 (patch)
treea0730b105301f9f766f7a0ea2db09ad0ff7f70f3
parentprofiles/prefix/darwin/macos: mask >dev-util/cmake-3.13.4 (diff)
downloadgentoo-45d7b4d6d7c5e9f2ca1d742a53072f3a92cb5a91.tar.gz
gentoo-45d7b4d6d7c5e9f2ca1d742a53072f3a92cb5a91.tar.bz2
gentoo-45d7b4d6d7c5e9f2ca1d742a53072f3a92cb5a91.zip
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 <polynomial-c@gentoo.org>
-rw-r--r--dev-lang/ocaml/files/ocaml-4.04.2-tinfo.patch13
-rw-r--r--dev-lang/ocaml/ocaml-4.04.2-r1.ebuild3
-rw-r--r--dev-lang/ocaml/ocaml-4.05.0-r1.ebuild3
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() {