summaryrefslogtreecommitdiff
path: root/devel/ocaml-base/files/patch-src_discover_discover.ml
diff options
context:
space:
mode:
authorBenjamin Jacobs <freebsd@dev.thsi.be>2024-05-22 19:06:27 +0200
committerGuido Falsi <madpilot@FreeBSD.org>2024-05-22 19:16:28 +0200
commitbb2bea65dbac365184f0efd68e9b79201fe5c533 (patch)
treeb5ab1616201cd2b8dad95d0d0f6a3c52fba7a88a /devel/ocaml-base/files/patch-src_discover_discover.ml
parentdevel/ninja: Roll back to 1.11.1 (diff)
ocaml: Updates to ocaml compiler and several ocaml ports
- Update devel/ocaml to 4.14.2 [1] - Specify runtime dependency on GNU AS as full path, this fixes build on armv6 - armv7 [1] [2] - converters/ocaml-base64: Update to 3.5.1, add LICENSE, other improvements - converters/ocaml-jsonm: Strip shared objects [3] - databases/ocaml-dbm: Update to 1.3, move to gitlub, other improvements - devel/menhir: Update to 20231231 - devel/ocaml-base: Unbreak non-x86 [2] - devel/ocaml-camlp-streams: Silence patch and strip commands - devel/ocaml-ipaddr: Update to 5.5.0 - devel/ocaml-lwt: Update to 5.7.0 [4] - devel/ocaml-result: Set package version, strip shared objects [5] - devel/ocaml-sexplib: Resurrect and update to 0.16.0. - devel/ocaml-stdio: Update to 0.17.0 - security/ocaml-cryptokit: Update to 1.19, add LICENSE, other improvements - security/ocaml-ssl: Update to 0.7.0, install stublibs in package directory [6] - x11-toolkits/ocaml-graphics: Reorder Makefile, silence patch command - Bump PORTREVISION on ports requiring it after update. Adding ports: - devel/ocaml-cstruct - devel/ocaml-compiler-libs [7] - devel/ocaml-ppx_derivers [7] - devel/ocaml-ppxlib [7] - devel/ocaml-domain-name - devel/ocaml-ocplib-endian [8] - devel/ocaml-parsexp - devel/ocaml-ppx_sexp_conv - security/ocaml-lwt_ssl [9] Resetting maintainership from michipili@gmail.com due to multiple timeouts and long term unresponsiveness. Assigning maintainership of lang/ocaml to author of this patch. Many thanks to him for his work! PR: 278300 [1], 278791 [2], 277818 [3], 277781 [4], 277775 [6], 277779 [7], 277780 [8], 277782 [9] Approved by: michipili@gmail.com (maintainer timeout) [1], danfe@FreeBSD.org (maintainer timeout) [3] [4] [6], fixit, avoid breakage [5] Differential Revision: https://reviews.freebsd.org/D45254
Diffstat (limited to 'devel/ocaml-base/files/patch-src_discover_discover.ml')
-rw-r--r--devel/ocaml-base/files/patch-src_discover_discover.ml14
1 files changed, 14 insertions, 0 deletions
diff --git a/devel/ocaml-base/files/patch-src_discover_discover.ml b/devel/ocaml-base/files/patch-src_discover_discover.ml
new file mode 100644
index 000000000000..f2339c100a1d
--- /dev/null
+++ b/devel/ocaml-base/files/patch-src_discover_discover.ml
@@ -0,0 +1,14 @@
+--- src/discover/discover.ml.orig 2024-04-29 15:54:18 UTC
++++ src/discover/discover.ml
+@@ -4,7 +4,11 @@ int main(int argc, char ** argv)
+ {|
+ int main(int argc, char ** argv)
+ {
++#if defined(__clang__) && !defined(__x86_64__) && !defined(__i386__)
++#error "-mpopcnt is not for this arch"
++#else
+ return __builtin_popcount(argc);
++#endif
+ }
+ |}
+ ;;