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 5EC4C1382C5 for ; Thu, 28 Jan 2021 22:15:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8790FE03EC; Thu, 28 Jan 2021 22:15:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 5AE53E03EC for ; Thu, 28 Jan 2021 22:15:26 +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 548023406D1 for ; Thu, 28 Jan 2021 22:15:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8BCA1476 for ; Thu, 28 Jan 2021 22:15:22 +0000 (UTC) From: "Alfredo Tupone" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alfredo Tupone" Message-ID: <1611872108.77fd8a0f1e7d400c8658105c0e0163ac49b6412b.tupone@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/, dev-lang/ocaml/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/ocaml/files/ocaml-4.05.0-gcc10.patch dev-lang/ocaml/ocaml-4.05.0-r2.ebuild X-VCS-Directories: dev-lang/ocaml/files/ dev-lang/ocaml/ X-VCS-Committer: tupone X-VCS-Committer-Name: Alfredo Tupone X-VCS-Revision: 77fd8a0f1e7d400c8658105c0e0163ac49b6412b X-VCS-Branch: master Date: Thu, 28 Jan 2021 22:15:22 +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: 4a2f610c-4f03-4d84-b4e0-a4bef7e5789a X-Archives-Hash: f46d65fb4044499f13fed43176753f1c commit: 77fd8a0f1e7d400c8658105c0e0163ac49b6412b Author: Alfredo Tupone gentoo org> AuthorDate: Thu Jan 28 22:15:08 2021 +0000 Commit: Alfredo Tupone gentoo org> CommitDate: Thu Jan 28 22:15:08 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77fd8a0f dev-lang/ocaml: build with gcc-10 Bug: https://bugs.gentoo.org/735274 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Alfredo Tupone gentoo.org> dev-lang/ocaml/files/ocaml-4.05.0-gcc10.patch | 59 ++++++++++++ dev-lang/ocaml/ocaml-4.05.0-r2.ebuild | 132 ++++++++++++++++++++++++++ 2 files changed, 191 insertions(+) diff --git a/dev-lang/ocaml/files/ocaml-4.05.0-gcc10.patch b/dev-lang/ocaml/files/ocaml-4.05.0-gcc10.patch new file mode 100644 index 00000000000..a0c67da534a --- /dev/null +++ b/dev-lang/ocaml/files/ocaml-4.05.0-gcc10.patch @@ -0,0 +1,59 @@ +--- a/byterun/caml/intext.h 2021-01-28 22:46:20.400224678 +0100 ++++ b/byterun/caml/intext.h 2021-01-28 22:46:49.312751054 +0100 +@@ -196,7 +196,7 @@ + + CAMLextern struct code_fragment * caml_extern_find_code(char *addr); + +-struct ext_table caml_code_fragments_table; ++extern struct ext_table caml_code_fragments_table; + + #endif /* CAML_INTERNALS */ + +--- a/byterun/caml/major_gc.h 2021-01-28 22:44:12.193323457 +0100 ++++ b/byterun/caml/major_gc.h 2021-01-28 22:45:20.918198701 +0100 +@@ -64,9 +64,9 @@ + extern char *caml_gc_sweep_hp; + + extern int caml_major_window; +-double caml_major_ring[Max_major_window]; +-int caml_major_ring_index; +-double caml_major_work_credit; ++extern double caml_major_ring[Max_major_window]; ++extern int caml_major_ring_index; ++extern double caml_major_work_credit; + extern double caml_gc_clock; + + /* [caml_major_gc_hook] is called just between the end of the mark +--- a/byterun/meta.c 2021-01-28 22:47:34.148016359 +0100 ++++ b/byterun/meta.c 2021-01-28 22:47:56.048657393 +0100 +@@ -32,6 +32,8 @@ + #include "caml/prims.h" + #include "caml/stacks.h" + ++struct ext_table caml_code_fragments_table; ++ + #ifndef NATIVE_CODE + + CAMLprim value caml_get_global_data(value unit) +--- a/byterun/backtrace.c 2021-01-28 22:50:25.275226598 +0100 ++++ b/byterun/backtrace.c 2021-01-28 22:50:37.541027290 +0100 +@@ -28,7 +28,7 @@ + #include "caml/fail.h" + + /* The table of debug information fragments */ +-struct ext_table caml_debug_info; ++extern struct ext_table caml_debug_info; + + CAMLexport int32_t caml_backtrace_active = 0; + CAMLexport int32_t caml_backtrace_pos = 0; +--- a/asmrun/startup.c 2021-01-28 23:02:50.526072662 +0100 ++++ b/asmrun/startup.c 2021-01-28 23:03:09.977754311 +0100 +@@ -44,7 +44,7 @@ + #endif + + extern int caml_parser_trace; +-CAMLexport header_t caml_atom_table[256]; ++CAMLextern header_t caml_atom_table[256]; + char * caml_code_area_start, * caml_code_area_end; + + /* Initialize the atom table and the static data and code area limits. */ diff --git a/dev-lang/ocaml/ocaml-4.05.0-r2.ebuild b/dev-lang/ocaml/ocaml-4.05.0-r2.ebuild new file mode 100644 index 00000000000..dc6ca02c535 --- /dev/null +++ b/dev-lang/ocaml/ocaml-4.05.0-r2.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +inherit flag-o-matic eutils multilib versionator toolchain-funcs + +PATCHLEVEL="9" +MY_P="${P/_/-}" +DESCRIPTION="Type-inferring functional programming language descended from the ML family" +HOMEPAGE="https://ocaml.org" +SRC_URI="https://github.com/ocaml/ocaml/archive/${PV/_/+}.tar.gz -> ${MY_P}.tar.gz + mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2" + +LICENSE="QPL-1.0 LGPL-2" +# Everytime ocaml is updated to a new version, everything ocaml must be rebuilt, +# so here we go with the subslot. +SLOT="0/${PV}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +IUSE="emacs flambda latex ncurses +ocamlopt spacetime X xemacs" + +RDEPEND=" + sys-libs/binutils-libs:= + ncurses? ( sys-libs/ncurses:0= ) + spacetime? ( sys-libs/libunwind:= ) + X? ( x11-libs/libX11 ) + !dev-ml/num" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +PDEPEND="emacs? ( app-emacs/ocaml-mode ) + xemacs? ( app-xemacs/ocaml )" + +S="${WORKDIR}/${MY_P}" +pkg_setup() { + # dev-lang/ocaml creates its own objects but calls gcc for linking, which will + # results in relocations if gcc wants to create a PIE executable + if gcc-specs-pie ; then + append-ldflags -nopie + ewarn "Ocaml generates its own native asm, you're using a PIE compiler" + ewarn "We have appended -nopie to ocaml build options" + ewarn "because linking an executable with pie while the objects are not pic will not work" + fi +} + +src_prepare() { + EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" + epatch "${FILESDIR}/${PN}-4.04.2-tinfo.patch" #459512 + epatch "${FILESDIR}"/${P}-gcc10.patch +} + +src_configure() { + export LC_ALL=C + local myconf="" + + # Causes build failures because it builds some programs with -pg, + # bug #270920 + filter-flags -fomit-frame-pointer + # Bug #285993 + filter-mfpmath sse + + # -ggdb3 & co makes it behave weirdly, breaks sexplib + replace-flags -ggdb* -ggdb + + # It doesn't compile on alpha without this LDFLAGS + use alpha && append-ldflags "-Wl,--no-relax" + + use ncurses || myconf="${myconf} -no-curses" + use X || myconf="${myconf} -no-graph" + use flambda && myconf="${myconf} -flambda" + use spacetime && myconf="${myconf} -spacetime" + + # ocaml uses a home-brewn configure script, preventing it to use econf. + RAW_LDFLAGS="$(raw-ldflags)" ./configure \ + --prefix "${EPREFIX}"/usr \ + --bindir "${EPREFIX}"/usr/bin \ + --target-bindir "${EPREFIX}"/usr/bin \ + --libdir "${EPREFIX}"/usr/$(get_libdir)/ocaml \ + --mandir "${EPREFIX}"/usr/share/man \ + -target "${CHOST}" \ + -host "${CBUILD}" \ + -cc "$(tc-getCC)" \ + -as "$(tc-getAS)" \ + -aspp "$(tc-getCC) -c" \ + -partialld "$(tc-getLD) -r" \ + --with-pthread ${myconf} || die "configure failed!" + + # http://caml.inria.fr/mantis/view.php?id=4698 + export CCLINKFLAGS="${LDFLAGS}" +} + +src_compile() { + emake world + + # Native code generation can be disabled now + if use ocamlopt ; then + # bug #279968 + emake opt + emake -j1 opt.opt + fi +} + +src_test() { + if use ocamlopt ; then + emake -j1 tests + else + ewarn "${PN} testsuite requires ocamlopt useflag" + fi +} + +src_install() { + emake BINDIR="${ED}"/usr/bin \ + LIBDIR="${ED}"/usr/$(get_libdir)/ocaml \ + MANDIR="${ED}"/usr/share/man \ + install + + # Symlink the headers to the right place + dodir /usr/include + dosym /usr/$(get_libdir)/ocaml/caml /usr/include/caml + + dodoc Changes README.adoc + + # Create and envd entry for latex input files + if use latex ; then + echo "TEXINPUTS=${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:" > "${T}"/99ocamldoc + doenvd "${T}"/99ocamldoc + fi + + # Install ocaml-rebuild portage set + insinto /usr/share/portage/config/sets + doins "${FILESDIR}/ocaml.conf" +}