* [gentoo-commits] repo/gentoo:master commit in: dev-ml/ppx_inline_test/files/, dev-ml/ppx_inline_test/
@ 2016-05-03 14:17 Alexis Ballier
0 siblings, 0 replies; 2+ messages in thread
From: Alexis Ballier @ 2016-05-03 14:17 UTC (permalink / raw
To: gentoo-commits
commit: 411ae34eb1cccbca5fc1825c728c1e7d31115493
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue May 3 13:54:14 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue May 3 14:17:38 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=411ae34e
dev-ml/ppx_inline_test: fix build with ocaml 4.03
Package-Manager: portage-2.2.28
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
dev-ml/ppx_inline_test/files/oc43.patch | 59 ++++++++++++++++++++++
.../ppx_inline_test-113.33.00.ebuild | 6 ++-
2 files changed, 64 insertions(+), 1 deletion(-)
diff --git a/dev-ml/ppx_inline_test/files/oc43.patch b/dev-ml/ppx_inline_test/files/oc43.patch
new file mode 100644
index 0000000..b5fbe11
--- /dev/null
+++ b/dev-ml/ppx_inline_test/files/oc43.patch
@@ -0,0 +1,59 @@
+diff -uNr ppx_inline_test-113.33.00/_oasis ppx_inline_test-113.33.00+4.03/_oasis
+--- ppx_inline_test-113.33.00/_oasis 2016-03-09 16:44:54.000000000 +0100
++++ ppx_inline_test-113.33.00+4.03/_oasis 2016-03-22 15:13:50.000000000 +0100
+@@ -1,8 +1,8 @@
+ OASISFormat: 0.4
+-OCamlVersion: >= 4.02.3
++OCamlVersion: >= 4.03.0
+ FindlibVersion: >= 1.3.2
+ Name: ppx_inline_test
+-Version: 113.33.00
++Version: 113.33.00+4.03
+ Synopsis: Syntax extension for writing in-line tests in ocaml code
+ Authors: Jane Street Group, LLC <opensource@janestreet.com>
+ Copyrights: (C) 2015-2016 Jane Street Group LLC <opensource@janestreet.com>
+diff -uNr ppx_inline_test-113.33.00/opam ppx_inline_test-113.33.00+4.03/opam
+--- ppx_inline_test-113.33.00/opam 2016-03-18 12:08:01.000000000 +0100
++++ ppx_inline_test-113.33.00+4.03/opam 2016-03-22 17:51:37.000000000 +0100
+@@ -16,4 +16,4 @@
+ "ppx_driver"
+ "ppx_tools" {>= "0.99.3"}
+ ]
+-available: [ ocaml-version >= "4.02.3" ]
++available: [ ocaml-version >= "4.03.0" ]
+diff -uNr ppx_inline_test-113.33.00/src/ppx_inline_test.ml ppx_inline_test-113.33.00+4.03/src/ppx_inline_test.ml
+--- ppx_inline_test-113.33.00/src/ppx_inline_test.ml 2016-03-09 16:44:54.000000000 +0100
++++ ppx_inline_test-113.33.00+4.03/src/ppx_inline_test.ml 2016-03-22 15:13:50.000000000 +0100
+@@ -96,18 +96,18 @@
+
+ let expand_test ~loc ~path:_ id e =
+ assert_enabled loc;
+- apply_to_descr "test" ~loc (Some e) id (pexp_fun ~loc "" None (punit ~loc) e)
++ apply_to_descr "test" ~loc (Some e) id (pexp_fun ~loc Nolabel None (punit ~loc) e)
+ ;;
+
+ let expand_test_unit ~loc ~path:_ id e =
+ assert_enabled loc;
+- apply_to_descr "test_unit" ~loc (Some e) id (pexp_fun ~loc "" None (punit ~loc) e)
++ apply_to_descr "test_unit" ~loc (Some e) id (pexp_fun ~loc Nolabel None (punit ~loc) e)
+ ;;
+
+ let expand_test_module ~loc ~path:_ id m =
+ assert_enabled loc;
+ apply_to_descr "test_module" ~loc ~inner_loc:m.pmod_loc None id
+- (pexp_fun ~loc "" None (punit ~loc)
++ (pexp_fun ~loc Nolabel None (punit ~loc)
+ (pexp_letmodule ~loc (Located.mk ~loc "M")
+ m
+ (eunit ~loc)))
+@@ -120,9 +120,8 @@
+ pstr ((
+ pstr_value nonrecursive (
+ value_binding
+- ~pat:(map (pstring __) ~f:(fun f x -> f (Some x)))
++ ~pat:(alt_option (pstring __) ppat_any)
+ ~expr ^:: nil)
+- ||| map (pstr_eval expr nil) ~f:(fun f -> f None)
+ ) ^:: nil)
+
+ let test =
diff --git a/dev-ml/ppx_inline_test/ppx_inline_test-113.33.00.ebuild b/dev-ml/ppx_inline_test/ppx_inline_test-113.33.00.ebuild
index 65a4219..79eb843 100644
--- a/dev-ml/ppx_inline_test/ppx_inline_test-113.33.00.ebuild
+++ b/dev-ml/ppx_inline_test/ppx_inline_test-113.33.00.ebuild
@@ -4,7 +4,7 @@
EAPI="5"
-inherit oasis
+inherit oasis eutils
MY_P=${PN/-/_}-${PV}
DESCRIPTION="Syntax extension for writing in-line tests in ocaml code"
@@ -25,6 +25,10 @@ DEPEND="${DEPEND} dev-ml/opam"
S="${WORKDIR}/${MY_P}"
+src_prepare() {
+ has_version '>=dev-lang/ocaml-4.03' && epatch "${FILESDIR}/oc43.patch"
+}
+
src_configure() {
emake setup.exe
OASIS_SETUP_COMMAND="./setup.exe" oasis_src_configure
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ml/ppx_inline_test/files/, dev-ml/ppx_inline_test/
@ 2023-02-08 22:18 Maciej Barć
0 siblings, 0 replies; 2+ messages in thread
From: Maciej Barć @ 2023-02-08 22:18 UTC (permalink / raw
To: gentoo-commits
commit: 216c94add051b5fb61539b5e444ada5c6c023636
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 8 22:04:54 2023 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Wed Feb 8 22:17:58 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=216c94ad
dev-ml/ppx_inline_test: patch for newest ppxlib
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
.../files/ppx_inline_test-0.15.0-pr39.patch | 23 ++++++++++++++++++
.../ppx_inline_test-0.15.0-r3.ebuild | 28 ++++++++++++++++++++++
2 files changed, 51 insertions(+)
diff --git a/dev-ml/ppx_inline_test/files/ppx_inline_test-0.15.0-pr39.patch b/dev-ml/ppx_inline_test/files/ppx_inline_test-0.15.0-pr39.patch
new file mode 100644
index 000000000000..39c5a9c8ca0a
--- /dev/null
+++ b/dev-ml/ppx_inline_test/files/ppx_inline_test-0.15.0-pr39.patch
@@ -0,0 +1,23 @@
+From 99e6e5819118c3ebf06bccc879a15175b9221148 Mon Sep 17 00:00:00 2001
+From: Carl Eastlund <ceastlund@janestreet.com>
+Date: Thu, 19 Jan 2023 12:25:16 -0500
+Subject: [PATCH] Stop using [Ppxlib.File_path].
+
+Signed-off-by: Carl Eastlund <ceastlund@janestreet.com>
+---
+ src/ppx_inline_test.ml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ppx_inline_test.ml b/src/ppx_inline_test.ml
+index 7f2e854..37c9791 100644
+--- a/src/ppx_inline_test.ml
++++ b/src/ppx_inline_test.ml
+@@ -82,7 +82,7 @@ let rec short_desc_of_expr ~max_len e =
+ ;;
+
+ let descr ~(loc:Location.t) ?(inner_loc=loc) e_opt id_opt =
+- let filename = File_path.get_default_path loc in
++ let filename = loc.loc_start.pos_fname in
+ let line = loc.loc_start.pos_lnum in
+ let start_pos = loc.loc_start.pos_cnum - loc.loc_start.pos_bol in
+ let end_pos = inner_loc.Location.loc_end.pos_cnum - loc.loc_start.pos_bol in
diff --git a/dev-ml/ppx_inline_test/ppx_inline_test-0.15.0-r3.ebuild b/dev-ml/ppx_inline_test/ppx_inline_test-0.15.0-r3.ebuild
new file mode 100644
index 000000000000..c54ad31da8b2
--- /dev/null
+++ b/dev-ml/ppx_inline_test/ppx_inline_test-0.15.0-r3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Syntax extension for writing in-line tests in ocaml code"
+HOMEPAGE="https://github.com/janestreet/ppx_inline_test"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+# https://bugs.gentoo.org/749291#c2
+RESTRICT="test"
+
+RDEPEND="
+ >=dev-ml/ppxlib-0.29.0:=
+ dev-ml/base:=
+ dev-ml/time_now:${SLOT}
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-pr39.patch )
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-02-08 22:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-08 22:18 [gentoo-commits] repo/gentoo:master commit in: dev-ml/ppx_inline_test/files/, dev-ml/ppx_inline_test/ Maciej Barć
-- strict thread matches above, loose matches on Subject: below --
2016-05-03 14:17 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox