Page MenuHomeFreeBSD

OCaml update
Needs ReviewPublic

Authored by freebsd_dev.thsi.be on Sat, Dec 28, 7:57 PM.
Tags
None
Referenced Files
F106842801: D48228.id148519.diff
Mon, Jan 6, 7:33 AM
F106841207: D48228.id148513.diff
Mon, Jan 6, 6:56 AM
F106841102: D48228.id148504.diff
Mon, Jan 6, 6:54 AM
F106839013: D48228.id148518.diff
Mon, Jan 6, 6:15 AM
F106838816: D48228.id148521.diff
Mon, Jan 6, 6:10 AM
F106798073: D48228.diff
Sun, Jan 5, 1:38 PM
Unknown Object (File)
Sat, Jan 4, 4:51 AM
Unknown Object (File)
Sat, Jan 4, 3:53 AM
Subscribers
This revision needs review, but there are no reviewers specified.

Details

Reviewers
None
Summary
* lang/ocaml
   - Ship pkg trigger to update ${OCAML_LIBDIR}/ld.conf from
      ${OCAML_LIBDIR}/ld.conf.d/*.conf fragments. [2]

    - Patch the ARMv7 native backend to use ARMv7-A VFPv3. This improves
      the native floating point support on armv7 from "non-working at all"
      to "still buggy". [1]

    - Fix other ARM codegen issues, allowing to drop the binutils dependency.

* New ports
  - devel/ocaml-alcotest:       New port, user-friendly unit testing for OCaml
  - devel/ocaml-qcheck:         New port, property-based testing library for OCaml

* Ports updates
  - devel/ocaml-calendar:       Update to 3.0.0, improve port
  - devel/ocaml-camomile:       Update to 2.0.0 [4, 6]
  - devel/ocaml-cmdliner:       Update to 1.3.0, improve port [4, 7]
  - devel/ocaml-cppo:           Update to 1.8.0 [3]
  - devel/ocaml-dolmen:         Update to 0.1, improve port [3]
  - devel/ocaml-dune:           Update to 3.16.0 [4, 9]
  - devel/ocaml-extlib:         Update to 1.8.0, improve port [3, 21]
  - devel/ocaml-lacaml:	        Update to 11.1.1, improve port [3]
  - devel/ocaml-linol:          Update to 0.7, improve port [3]
  - devel/ocaml-lsp:            Update to 1.20.1, improve port [3]
  - devel/ocaml-lwt:            Update to 5.9.0, fix port [4, 10, 11]
  - devel/ocaml-magic:          Update to 0.7.4, take maintainership, improve port
  - devel/ocaml-mtime:          Update to 2.1.0, improve port [3]
  - devel/ocaml-ocamlbuild:     Update to 0.15.0 [4, 5]
  - devel/ocaml-parmap:         Update to 1.2.5, improve port [22]
  - devel/ocaml-pcre:           Update to 8.0.1, improve port [4?, 14]
  - devel/ocaml-ppx_deriving:   Update to 6.0.3, improve port [3]
  - devel/ocaml-trace:          Update to 0.8, improve port [3]
  - graphics/ocaml-lablgl:      Update to 1.07, improve port
  - graphics/ocaml-images:      Update to 5.0.5 [20]
  - math/abella:                Fix build following ocaml-cmdliner update
  - math/alt-ergo:              Update to 2.6.0, improve port [3]
  - math/coq:                   Update to 8.20.0 [4, 12, 13]
  - math/ocamlgsl:              Update to 1.25, improve port
  - textproc/ocaml-text:        Update to 0.8.1, improve port [3]

* Port improvements
  - archivers/ocaml-zip:        Drop USES=ocaml:wash, set META version [15]
  - databases/ocaml-mysql:      pkg-plist, DISTVERSION switch, strip shared library,
                                drop camlp4 dependency [18]
  - devel/ocaml-annexlib        pkg-plist, LICENSE_FILE [19]
  - devel/ocaml-calendar:       pkg-plist, strip shared library, WWW, LICENSE_FILE,
                                test target
  - devel/ocaml-classes:        pkg-plist, LICENSE_FILE, native build,
                                missing BUILD/RUN_DEPENDS, OCaml 5
  - devel/coccinelle:           Chase ocaml-pcre update [3]
  - devel/ocaml-cmdliner:       Strip shared library, USE_OCAML_LDCONFIG cleanup [4, 7]
  - devel/ocaml-dolmen:         USE_GITHUB -> MASTER_SITES
  - devel/ocaml-lacaml:	        DISTVERSION switch, USE_GITHUB -> MASTER_SITES
  - devel/ocaml-linol:          USE_GITHUB -> MASTER_SITES, fix shared library [3]
  - devel/ocaml-lsp:            Fix WWW, USE_GITHUB -> MASTER_SITES [3]
  - devel/ocaml-magic:          Update MASTER_SITES, install EXAMPLES build script
  - devel/ocaml-ocplib-endian:  DISTVERSION switch [3]
  - devel/ocaml-pcre:           USE_GITHUB -> MASTER_SITES, update WWW,
                                switch to USES+=ocaml:dune, build EXAMPLES
  - devel/ocaml-ppx_deriving:   USE_GITHUB -> MASTER_SITES [3]
  - devel/ocaml-psmt2-frontend: Strip binary
  - devel/ocaml-sdl:            pkg-plist
  - devel/ocaml-trace:          USE_GITHUB -> MASTER_SITES [3]
  - devel/ocaml-topkg:          Missing RUN_DEPENDS, strip shared library [4, 8]
  - devel/ocaml-type_conv:      pkg-plist
  - devel/ocaml-ulex:           pkg-plist, LICENSE, LICENSE_FILE, undue ldconfig
  - devel/ocaml-react:          pkg-plist, EXAMPLES, test target, undue ldconfig,
                                OCaml 5 compat, take maintainership
  - devel/ocaml-xstrp4:         pkg-plist,
  - devel/ocaml-xstr:           pkg-plist, Makefile cleanup
  - ftp/ocaml-ocurl:            fix OCAML_LDLIBS (curl vs ocurl), drop camlp4 dependency,
                                drop redundant depemdencies. [17]
  - graphics/ocaml-lablgl:      Update WWW, update BUILD/RUN_DEPENDS, drop camlp4
  - lang/mtasc:                 fix BUILD_DEPENDS after extlib update
  - math/alt-ergo:              USE_GITHUB -> MASTER_SITES, update BUILD/RUN/
                                TEST_DEPENDS, drop patch, clean env for test
  - math/ocamlgsl:              USE_GITHUB -> MASTER_SITES, add armv7 to NOT_FOR_ARCHS
  - security/ocaml-cryptgps:    pkg-plist
  - textproc/ocaml-text:        USE_GITHUB -> MASTER_SITES, LICENSE, LICENSE_FILE,
                                pkg-plist, strip shared libraries, OPTIONS dependencies
  - textproc/sexp:              remove ocaml from RUN_DEPENDS
  - x11-toolkits/ocaml-lablgtk2: Drop USES=ocaml:wash, add gnomecanvas bindings,
                                Add GLADE_LIB_DEPENDS, GTKGLARE_USE, strip shared libraries [16]

PR:             283317 [1], 258859 [2], 277821 [2], 282125 [5], 280299 [6],
                262786 [7], 282124 [8], 278470 [9], 280721 [10], 282947 [11],
		278518 [13], 283712 [14], 283713 [15], 283714 [16], 283716 [17],
		283717 [18], 283718 [19], 283720 [20], 283719 [21], 283814 [22]
Reported-by:    Älven [10]
Reported-by:    Andrew Korobkov [12]
Approved-by:    submitter is maintainer [3], maintainer timeout [4]

Diff Detail

Repository
R11 FreeBSD ports repository
Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 61386
Build 58270: arc lint + arc unit

Event Timeline

freebsd_dev.thsi.be created this revision.
bofh added inline comments.
Mk/Uses/ocaml.mk
83

Can you rebase this section on top of my diff? Because your other parts specially args handling is not going to work for us. It needs lots of validation. And we are also handling empty declaration which made it more complex. USE_OCAML_LDCONFIG will be dead for declaration in ports. So just check with `defined(_USE_OCAML_LDCONFIG). If you need a git formatted patch that works for you let me know.

Mk/bsd.ocaml.mk
17

Let's forget this file entirely.

  • lang/ocaml: ld.conf trigger, switch ARMv7 to hard fp
  • Mk/Uses/ocaml.mk: USES=ocaml:ldconfig to use pkg trigger
  • ocaml-lacaml: Update to 11.1.1, improve port
  • devel/ocaml-ocamlbuild: Update to 0.15.0
  • devel/ocaml-camomile: Update to 2.0.0
  • devel/ocaml-cmdliner: Update to 1.3.0, improve port
  • devel/ocaml-topkg: Missing RUN_DEPENDS
  • devel/ocaml-dune: Update to 3.16.0
  • devel/ocaml-react: Take maintainership, improve port
  • devel/ocaml-lwt: Update to 5.9.0, fix ccache failure
  • math/coq: Update to 8.20.0
  • devel/ocaml-ocplib-endian: Improve port
  • graphics/ocaml-lablgl: Update to 1.07
  • graphics/ocaml-images: Update to 5.0.5
  • devel/ocaml-ppx_deriving: Update to 6.0.3
  • devel/ocaml-lsp: Update to 1.20.1
  • devel/ocaml-psmt2-frontend: Strip binary
  • devel/ocaml-mtime: Update to 2.1.0
  • devel/ocaml-trace: Update to 0.8
  • devel/ocaml-linol: Update to 0.7
  • devel/ocaml-dolmen: Update to 0.10
  • devel/ocaml-alcotest: New port, user-friendly unit testing for OCaml
  • devel/ocaml-qcheck: New port, property-based testing library for OCaml
  • math/alt-ergo: Update to 2.6.0, improve port
  • devel/ocaml-magic: Update to 0.7.4, take maintainership
  • math/abella: Fix build following ocaml-cmdliner update.
  • math/ocamlgsl: Update to 1.25.1
  • devel/ocaml-pcre: Update to 8.0.1, improve port
  • textproc/ocaml-text: Update to 0.8.1, improve port
  • devel/ocaml-xstrp4: kill USE_OCAMLFIND_PLIST
  • devel/ocaml-xstr: Kill USE_OCAMLFIND_PLIST
  • devel/ocaml-ulex: Kill USE_OCAMLFIND_PLIST, improve port
  • devel/ocaml-type_con: Kill USE_OCAMLFIND_PLIST
  • devel/ocaml-sdl: Kill USE_OCAMLFIND_PLIST
  • devel/ocaml-extlib: Update to 1.8.0, improve port
  • devel/ocaml-classes: Kill USE_OCAMLFIND_PLIST, improve port
  • security/ocaml-cryptgps: Kill USE_OCAMLFIND_PLIST
  • devel/ocaml-calendar: Update to 3.0.0, improve port
  • devel/ocaml-annexlib: Kill USE_OCAMLFIND_PLIST
  • databases/ocaml-mysql: Kill USE_OCAMLFIND_PLIST
  • ftp/ocaml-ocurl: Use proper OCAML_LDLIBS
  • lang/mtasc: Fix BUILD_DEPENDS after extlib update
  • archivers/ocaml-zip: drop USE_OCAML_WASH, set META version
  • x11-toolkits/ocaml-lablgtk2: drop USE_OCAML_WASH
  • */*: bump revision after ocaml update
  • USE_OCAML* -> USES=ocaml
freebsd_dev.thsi.be marked an inline comment as done.
  • x11-toolkits/ocaml-lablgtk2: Improve port
  • */*: bump revision after ocaml update
  • USE_OCAML* -> USES=ocaml
freebsd_dev.thsi.be edited the summary of this revision. (Show Details)
  • Uses/ocaml.mk documentation
  • Uses/ocaml.mk change !empty to defined

Rebased, refreshed and commit history cleaned-up.
I will refresh the summary later.

ocaml-zip ocaml:wash removal PR 283713 (timeout very likely)
ocaml-lablgtk2: ocaml:wash removal, misc improvements PR 283714 (timeout very likely)
Mk/Uses/ocaml.mk: removal of ocaml:wash.