Skip to content

Commit b37d8c5

Browse files
committed
ocaml-variants: Remove unnecessary patches
1 parent 09d0c99 commit b37d8c5

File tree

2 files changed

+2
-10
lines changed
  • packages/ocaml-variants
    • ocaml-variants.4.14.0+flambda1
    • ocaml-variants.4.14.0+flambda2

2 files changed

+2
-10
lines changed

packages/ocaml-variants/ocaml-variants.4.14.0+flambda1/opam

+1-5
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ conflict-class: "ocaml-core-compiler"
1616
flags: [ compiler avoid-version ]
1717
setenv: CAML_LD_LIBRARY_PATH = "%{lib}%/stublibs"
1818
install: [
19-
["sh" "-c" "cd \"${TMPDIR:-/tmp}\" && mv \"%{build}%\"/*.tar.gz \"%{build}%\"/alt-signal-stack.patch . && tar xvf special_dune.tar.gz && tar xvf ocaml-4.14.0.tar.gz && cd ocaml-4.14.0 && patch -p1 < ../alt-signal-stack.patch && ./configure \"--prefix=${TMPDIR:-/tmp}/ocaml\" && make -j%{jobs}% && make install && PATH=\"${TMPDIR:-/tmp}/ocaml/bin:$PATH\" %{make}% -C \"${TMPDIR:-/tmp}/dune-special_dune\" release && cp \"${TMPDIR:-/tmp}/dune-special_dune/dune.exe\" \"%{build}%/\" && cd \"%{build}%\" && autoconf && PATH=\"${TMPDIR:-/tmp}/ocaml/bin:$PATH\" ./configure \"--prefix=%{prefix}%\" --enable-middle-end=flambda \"--with-dune=%{build}%/dune.exe\" && PATH=\"${TMPDIR:-/tmp}/ocaml/bin:$PATH\" \"%{make}%\" -j%{jobs}% && PATH=\"${TMPDIR:-/tmp}/ocaml/bin:$PATH\" \"%{make}%\" install"]
19+
["sh" "-c" "cd \"${TMPDIR:-/tmp}\" && mv \"%{build}%\"/*.tar.gz . && tar xvf special_dune.tar.gz && tar xvf ocaml-4.14.0.tar.gz && cd ocaml-4.14.0 && ./configure \"--prefix=${TMPDIR:-/tmp}/ocaml\" && make -j%{jobs}% && make install && PATH=\"${TMPDIR:-/tmp}/ocaml/bin:$PATH\" %{make}% -C \"${TMPDIR:-/tmp}/dune-special_dune\" release && cp \"${TMPDIR:-/tmp}/dune-special_dune/dune.exe\" \"%{build}%/\" && cd \"%{build}%\" && autoconf && PATH=\"${TMPDIR:-/tmp}/ocaml/bin:$PATH\" ./configure \"--prefix=%{prefix}%\" --enable-middle-end=flambda \"--with-dune=%{build}%/dune.exe\" && PATH=\"${TMPDIR:-/tmp}/ocaml/bin:$PATH\" \"%{make}%\" -j%{jobs}% && PATH=\"${TMPDIR:-/tmp}/ocaml/bin:$PATH\" \"%{make}%\" install"]
2020
]
2121
conflicts: [
2222
"ocaml-option-32bit"
@@ -41,7 +41,3 @@ extra-source "ocaml-4.14.0.tar.gz" {
4141
url {
4242
src: "git+https://github.com/ocaml-flambda/flambda-backend.git"
4343
}
44-
extra-source "alt-signal-stack.patch" {
45-
src: "https://github.com/ocaml/ocaml/commit/1eeb0e7fe595f5f9e1ea1edbdf785ff3b49feeeb.patch"
46-
checksum: "sha256=59de25b95409c1927c4b607fb4b1218ff7623fca45474448c8e114a42853e3ad"
47-
}

packages/ocaml-variants/ocaml-variants.4.14.0+flambda2/opam

+1-5
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ conflict-class: "ocaml-core-compiler"
1616
flags: [ compiler avoid-version ]
1717
setenv: CAML_LD_LIBRARY_PATH = "%{lib}%/stublibs"
1818
install: [
19-
["sh" "-c" "cd \"${TMPDIR:-/tmp}\" && mv \"%{build}%\"/*.tar.gz \"%{build}%\"/alt-signal-stack.patch . && tar xvf special_dune.tar.gz && tar xvf ocaml-4.14.0.tar.gz && cd ocaml-4.14.0 && patch -p1 < ../alt-signal-stack.patch && ./configure \"--prefix=${TMPDIR:-/tmp}/ocaml\" && make -j%{jobs}% && make install && PATH=\"${TMPDIR:-/tmp}/ocaml/bin:$PATH\" %{make}% -C \"${TMPDIR:-/tmp}/dune-special_dune\" release && cp \"${TMPDIR:-/tmp}/dune-special_dune/dune.exe\" \"%{build}%/\" && cd \"%{build}%\" && autoconf && PATH=\"${TMPDIR:-/tmp}/ocaml/bin:$PATH\" ./configure \"--prefix=%{prefix}%\" --enable-middle-end=flambda2 \"--with-dune=%{build}%/dune.exe\" && PATH=\"${TMPDIR:-/tmp}/ocaml/bin:$PATH\" \"%{make}%\" -j%{jobs}% && PATH=\"${TMPDIR:-/tmp}/ocaml/bin:$PATH\" \"%{make}%\" install"]
19+
["sh" "-c" "cd \"${TMPDIR:-/tmp}\" && mv \"%{build}%\"/*.tar.gz . && tar xvf special_dune.tar.gz && tar xvf ocaml-4.14.0.tar.gz && cd ocaml-4.14.0 && ./configure \"--prefix=${TMPDIR:-/tmp}/ocaml\" && make -j%{jobs}% && make install && PATH=\"${TMPDIR:-/tmp}/ocaml/bin:$PATH\" %{make}% -C \"${TMPDIR:-/tmp}/dune-special_dune\" release && cp \"${TMPDIR:-/tmp}/dune-special_dune/dune.exe\" \"%{build}%/\" && cd \"%{build}%\" && autoconf && PATH=\"${TMPDIR:-/tmp}/ocaml/bin:$PATH\" ./configure \"--prefix=%{prefix}%\" --enable-middle-end=flambda2 \"--with-dune=%{build}%/dune.exe\" && PATH=\"${TMPDIR:-/tmp}/ocaml/bin:$PATH\" \"%{make}%\" -j%{jobs}% && PATH=\"${TMPDIR:-/tmp}/ocaml/bin:$PATH\" \"%{make}%\" install"]
2020
]
2121
conflicts: [
2222
"ocaml-option-32bit"
@@ -41,7 +41,3 @@ extra-source "ocaml-4.14.0.tar.gz" {
4141
url {
4242
src: "git+https://github.com/ocaml-flambda/flambda-backend.git"
4343
}
44-
extra-source "alt-signal-stack.patch" {
45-
src: "https://github.com/ocaml/ocaml/commit/1eeb0e7fe595f5f9e1ea1edbdf785ff3b49feeeb.patch"
46-
checksum: "sha256=59de25b95409c1927c4b607fb4b1218ff7623fca45474448c8e114a42853e3ad"
47-
}

0 commit comments

Comments
 (0)