From d3f4e44a1938a49d8ebca751f800c85f654dd9cf Mon Sep 17 00:00:00 2001 From: Samuel Hym Date: Thu, 29 Aug 2024 16:53:11 +0200 Subject: [PATCH] Remove the local OPAM repository --- .github/opam/custom/repo | 1 - .github/opam/ocaml-variants.opam.unix | 107 -------------------- .github/opam/ocaml-variants.opam.windows | 121 ----------------------- 3 files changed, 229 deletions(-) delete mode 100644 .github/opam/custom/repo delete mode 100644 .github/opam/ocaml-variants.opam.unix delete mode 100644 .github/opam/ocaml-variants.opam.windows diff --git a/.github/opam/custom/repo b/.github/opam/custom/repo deleted file mode 100644 index 013b84db..00000000 --- a/.github/opam/custom/repo +++ /dev/null @@ -1 +0,0 @@ -opam-version: "2.0" diff --git a/.github/opam/ocaml-variants.opam.unix b/.github/opam/ocaml-variants.opam.unix deleted file mode 100644 index 2de3f476..00000000 --- a/.github/opam/ocaml-variants.opam.unix +++ /dev/null @@ -1,107 +0,0 @@ -opam-version: "2.0" -synopsis: "Custom compiler __OCAML_COMPILER_FULL_VERSION__" -maintainer: "platform@lists.ocaml.org" -authors: [ - "Xavier Leroy" - "Damien Doligez" - "Alain Frisch" - "Jacques Garrigue" - "Didier Rémy" - "Jérôme Vouillon" -] -license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" -homepage: "https://ocaml.org" -bug-reports: "https://github.com/ocaml/opam-repository/issues" -depends: [ - "ocaml" {= "__OCAML_OPAM_PACKAGE_VERSION__" & post} - "base-unix" {post} - "base-bigarray" {post} - "base-threads" {post} - "base-domains" {post} - "base-nnp" {post} - "ocaml-option-bytecode-only" {arch != "arm64" & arch != "x86_64"} - "ocaml-beta" {opam-version < "2.1.0"} -] -depopts: [ - "ocaml-option-32bit" - "ocaml-option-afl" - "ocaml-option-bytecode-only" - "ocaml-option-no-flat-float-array" - "ocaml-option-flambda" - "ocaml-option-fp" - "ocaml-option-musl" - "ocaml-option-leak-sanitizer" - "ocaml-option-address-sanitizer" - "ocaml-option-static" -] -conflict-class: "ocaml-core-compiler" -flags: [compiler avoid-version] -setenv: CAML_LD_LIBRARY_PATH = "%{lib}%/stublibs" -build: [ - [ - "./configure" - "--prefix=%{prefix}%" - "--docdir=%{doc}%/ocaml" - "-C" - "--with-afl" {ocaml-option-afl:installed} - "--disable-native-compiler" {ocaml-option-bytecode-only:installed} - "--disable-flat-float-array" {ocaml-option-no-flat-float-array:installed} - "--enable-flambda" {ocaml-option-flambda:installed} - "--enable-frame-pointers" {ocaml-option-fp:installed} - "CC=cc" - {!ocaml-option-32bit:installed & !ocaml-option-musl:installed & - (os = "openbsd" | os = "macos")} - "CC=musl-gcc" {ocaml-option-musl:installed & os-distribution != "alpine"} - "CFLAGS=-Os" {ocaml-option-musl:installed} - "LDFLAGS=-Wl,--no-as-needed,-ldl" - {ocaml-option-leak-sanitizer:installed | - ocaml-option-address-sanitizer:installed & os != "macos"} - "CC=gcc -ldl -fsanitize=leak -fno-omit-frame-pointer -O1 -g" - {ocaml-option-leak-sanitizer:installed} - "CC=gcc -ldl -fsanitize=address -fno-omit-frame-pointer -O1 -g" - {ocaml-option-address-sanitizer:installed & os != "macos"} - "CC=clang -fsanitize=address -fno-omit-frame-pointer -O1 -g" - {ocaml-option-address-sanitizer:installed & os = "macos"} - "CC=gcc -m32" {ocaml-option-32bit:installed & os = "linux"} - "CC=gcc -Wl,-read_only_relocs,suppress -arch i386 -m32" - {ocaml-option-32bit:installed & os = "macos"} - "ASPP=cc -c" - {!ocaml-option-32bit:installed & !ocaml-option-musl:installed & - (os = "openbsd" | os = "macos")} - "ASPP=musl-gcc -c" - {ocaml-option-musl:installed & os-distribution != "alpine"} - "ASPP=gcc -m32 -c" {ocaml-option-32bit:installed & os = "linux"} - "ASPP=gcc -arch i386 -m32 -c" - {ocaml-option-32bit:installed & os = "macos"} - "AS=as --32" {ocaml-option-32bit:installed & os = "linux"} - "AS=as -arch i386" {ocaml-option-32bit:installed & os = "macos"} - "--host=i386-linux" {ocaml-option-32bit:installed & os = "linux"} - "--host=i386-apple-darwin13.2.0" - {ocaml-option-32bit:installed & os = "macos"} - "PARTIALLD=ld -r -melf_i386" - {ocaml-option-32bit:installed & os = "linux"} - "LIBS=-static" {ocaml-option-static:installed} - "--disable-warn-error" - ] - [make "-j%{jobs}%"] -] -install: [make "install"] -build-env: [ - [LSAN_OPTIONS = "detect_leaks=0,exitcode=0"] - [ASAN_OPTIONS = "detect_leaks=0,exitcode=0"] -] -post-messages: [ - """\ -A failure in the middle of the build may be caused by build parallelism - (enabled by default). - See https://github.com/ocaml/opam-repository/pull/14257 for more info.""" - {failure & jobs > "1" & os != "cygwin"} - """\ -You can try installing again including --jobs=1 - to force a sequential build instead.""" - {failure & jobs > "1" & os != "cygwin" & opam-version >= "2.0.5"} -] -dev-repo: "git+https://github.com/ocaml/ocaml.git" -url { - src: "__OCAML_COMPILER_SRC__" -} diff --git a/.github/opam/ocaml-variants.opam.windows b/.github/opam/ocaml-variants.opam.windows deleted file mode 100644 index 0dbe3bd7..00000000 --- a/.github/opam/ocaml-variants.opam.windows +++ /dev/null @@ -1,121 +0,0 @@ -opam-version: "2.0" -synopsis: "Custom compiler __OCAML_COMPILER_FULL_VERSION__" -license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" -maintainer: "platform@lists.ocaml.org" -authors: ["Xavier Leroy" "Damien Doligez" "Alain Frisch" "Jacques Garrigue" "Didier Rémy" "Jérôme Vouillon"] -homepage: "https://ocaml.org" -bug-reports: "https://github.com/ocaml-multicore/multicoretests/issues" -dev-repo: "git+https://github.com/ocaml/ocaml.git" -depends: [ - "ocaml" {= "__OCAML_OPAM_PACKAGE_VERSION__" & post} - "base-unix" {post} - "base-bigarray" {post} - "base-threads" {post} - "base-domains" {post} - "base-nnp" {post} - "ocaml-option-bytecode-only" {arch != "arm64" & arch != "x86_64"} - "conf-flexdll" {os = "cygwin"} - ("flexdll" {os = "win32"} | "flexdll-bin" {os = "win32"} & "flexlink" {os = "win32" & post}) -] -conflict-class: "ocaml-core-compiler" -flags: compiler -setenv: CAML_LD_LIBRARY_PATH = "%{lib}%/stublibs" -build-env: [ - [PATH += "%{lib}%/%{flexdll-bin:installed?flexdll-bin:ocaml}%"] - [LSAN_OPTIONS = "detect_leaks=0,exitcode=0"] - [ASAN_OPTIONS = "detect_leaks=0,exitcode=0"] -] -build: [ - [ - # General configuration - "./configure" "-C" "--prefix=%{prefix}%" "--docdir=%{doc}%/ocaml" - - # Windows-specific configuration - "--with-flexdll=%{flexdll:share}%" {flexdll:installed} - - # Options - "--disable-warn-error" - - "--enable-native-compiler" {!ocaml-option-bytecode-only:installed} - "--disable-native-compiler" {ocaml-option-bytecode-only:installed} - - "--with-afl" {ocaml-option-afl:installed} - "--disable-flat-float-array" {ocaml-option-no-flat-float-array:installed} - "--enable-flambda" {ocaml-option-flambda:installed} - "--enable-frame-pointers" {ocaml-option-fp:installed} - - "LIBS=-static" {ocaml-option-static:installed} - - # Force use of cc for macOS and OpenBSD - "CC=cc" {!ocaml-option-32bit:installed & !ocaml-option-musl:installed & (os="openbsd"|os="macos")} - "ASPP=cc -c" {!ocaml-option-32bit:installed & !ocaml-option-musl:installed & (os="openbsd"|os="macos")} - - # Windows ports - "--build=x86_64-pc-cygwin" {os = "win32" & arch = "x86_64"} - "--build=i686-pc-cygwin" {os = "win32" & arch = "i686"} - # Fix on Cygwin - "--enable-imprecise-c99-float-ops" {os = "cygwin"} - - "--host=i686-w64-mingw32" {ocaml-option-mingw:installed & ocaml-option-32bit:installed} - "--host=x86_64-w64-mingw32" {ocaml-option-mingw:installed & !ocaml-option-32bit:installed} - "--host=i686-pc-windows" {ocaml-option-msvc:installed & ocaml-option-32bit:installed} - "--host=x86_64-pc-windows" {ocaml-option-msvc:installed & !ocaml-option-32bit:installed} - - # Compilation with musl - "CC=musl-gcc" {ocaml-option-musl:installed & os-distribution!="alpine"} - "CFLAGS=-Os" {ocaml-option-musl:installed} - "ASPP=musl-gcc -c" {ocaml-option-musl:installed & os-distribution!="alpine"} - - # Compilation with sanitisers - "LDFLAGS=-Wl,--no-as-needed,-ldl" {ocaml-option-leak-sanitizer:installed | (ocaml-option-address-sanitizer:installed & os!="macos")} - "CC=gcc -ldl -fsanitize=leak -fno-omit-frame-pointer -O1 -g" {ocaml-option-leak-sanitizer:installed} - "CC=gcc -ldl -fsanitize=address -fno-omit-frame-pointer -O1 -g" {ocaml-option-address-sanitizer:installed & os!="macos"} - "CC=clang -fsanitize=address -fno-omit-frame-pointer -O1 -g" {ocaml-option-address-sanitizer:installed & os="macos"} - - # 32-bit compilation (Linux) - "--host=i386-pc-linux-gnu" {ocaml-option-32bit:installed & os="linux"} - "CC=gcc -m32" {ocaml-option-32bit:installed & os="linux"} - "AS=as --32" {ocaml-option-32bit:installed & os="linux"} - "ASPP=gcc -m32 -c" {ocaml-option-32bit:installed & os="linux"} - "PARTIALLD=ld -r -melf_i386" {ocaml-option-32bit:installed & os="linux"} - - # 32-bit compilation (macOS) - "--host=i386-apple-darwin" {ocaml-option-32bit:installed & os="macos"} - "CC=gcc -Wl,-read_only_relocs,suppress -arch i386 -m32" {ocaml-option-32bit:installed & os="macos"} - "AS=as -arch i386" {ocaml-option-32bit:installed & os="macos"} - "ASPP=gcc -arch i386 -m32 -c" {ocaml-option-32bit:installed & os="macos"} - ] - [make "-j%{jobs}%"] -] -install: [make "install"] -url { - src: "__OCAML_COMPILER_SRC__" -} -post-messages: [ - "A failure in the middle of the build may be caused by build parallelism - (enabled by default). - Please file a bug report at https://github.com/ocaml/opam-repository/issues" - {failure & jobs > 1} - "You can try installing again including --jobs=1 - to force a sequential build instead." - {failure & jobs > 1 & opam-version >= "2.0.5"} -] -conflicts: [ "ocaml-option-fp" "ocaml-option-msvc" ] -depopts: [ - "ocaml-option-32bit" - "ocaml-option-afl" - "ocaml-option-bytecode-only" - "ocaml-option-no-flat-float-array" - "ocaml-option-flambda" - "ocaml-option-musl" - "ocaml-option-leak-sanitizer" - "ocaml-option-address-sanitizer" - "ocaml-option-static" - "ocaml-option-mingw" - # TODO: the full behaviour for Cygwin _should_ be that if the Cygwin flexdll is installed and opam's flexdll is not requested, - # then use it; if Cygwin's flexdll is _not_ installed then the opam flexdll package should be pulled in (4.13+) or the - # depext system should cause flexdll to be installed (4.12 and earlier). If opam's flexdll is explicitly requested, then - # OCaml should recompile with it. - "flexdll" -] -available: os = "win32" | os = "cygwin"