diff options
| author | Mark Wright <gienah@gentoo.org> | 2017-01-11 23:28:57 +1100 |
|---|---|---|
| committer | Mark Wright <gienah@gentoo.org> | 2017-01-11 23:28:57 +1100 |
| commit | 301cf07863551d5e8b1ddaa51b4ac73081f040c6 (patch) | |
| tree | 1921784896000e28306e716244feac4a9c7b2b14 /dev-lang/teyjus/teyjus-2.0.2.ebuild | |
| parent | feb2442e154ad550bcca47a43a07d319c94de004 (diff) | |
| download | gentoo-301cf07863551d5e8b1ddaa51b4ac73081f040c6.tar.gz gentoo-301cf07863551d5e8b1ddaa51b4ac73081f040c6.tar.xz | |
dev-lang/teyjus: Bump to 2.1. Fix build with ocaml 4.03 and above.
Thanks to Toralf Forster for reporting.
Gentoo-bug: 591368
Package-Manager: portage-2.3.3
Diffstat (limited to 'dev-lang/teyjus/teyjus-2.0.2.ebuild')
| -rw-r--r-- | dev-lang/teyjus/teyjus-2.0.2.ebuild | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/dev-lang/teyjus/teyjus-2.0.2.ebuild b/dev-lang/teyjus/teyjus-2.0.2.ebuild index bb03ce15714..65c04a8c019 100644 --- a/dev-lang/teyjus/teyjus-2.0.2.ebuild +++ b/dev-lang/teyjus/teyjus-2.0.2.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="6" -inherit base elisp-common multilib versionator +inherit elisp-common multilib versionator MY_PN="${PN}-source" MY_P=$(version_format_string '${MY_PN}-$1.$2-b$3') @@ -18,8 +18,8 @@ KEYWORDS="~amd64 ~x86" LICENSE="GPL-3" IUSE="emacs examples +ocamlopt" -RDEPEND=">=sys-devel/binutils-2.17 - >=sys-devel/gcc-2.95.3 +RDEPEND=">=sys-devel/binutils-2.17:* + >=sys-devel/gcc-2.95.3:* >=dev-lang/ocaml-3.10[ocamlopt?] emacs? ( virtual/emacs )" DEPEND="${RDEPEND} @@ -27,12 +27,11 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${PN} -PATCHES=("${FILESDIR}/${PN}-2.0.2-flags.patch") - SITEFILE=50${PN}-gentoo.el src_prepare() { - base_src_prepare + default + eapply "${FILESDIR}/${PN}-2.0.2-flags.patch" local cflags="" for i in ${CFLAGS} do @@ -48,6 +47,17 @@ src_prepare() { -e "s@OCAMLFLAGS +=@OCAMLFLAGS +=${cflags}${lflags}@" \ -i "${S}/source/OMakefile" \ || die "Could not set flags in ${S}/teyjus/source/OMakefile" + if has_version ">=dev-lang/ocaml-4.03.0"; then + # bug 591368 + pushd "${S}/source" || die + sed -e 's@$(FNT)/ccode_stubs@$(FNT)/ccode_stubs_c@' \ + -e 's@\(FNT_ML_TO_C\[\] =\)@\1\n $(FNT)/ccode_stubs@' \ + -i OMakefile || die + cd "${S}/source/front" || die + mv ccode_stubs.mli ccode_stubs.ml || die + mv ccode_stubs.c ccode_stubs_c.c || die + popd || die + fi } src_compile() { |