Comment 1 Guangyuan Yang 2021-11-05 19:19:14 UTC

(In reply to hannes from comment #0)

Hi! Please set your name at https://bugs.freebsd.org/bugzilla/userprefs.cgi?tab=account so we could give you proper credits in future commit logs. Thanks!

(In reply to Guangyuan Yang from comment #1)

Done. :)

Comment 3 Guangyuan Yang 2021-11-05 21:15:32 UTC

Poudriere builds failed on my end - can you check?

http://jenkins.ygy.io/job/freebsd-ports-testing-13.0R-amd64/922/console

Created attachment 229304 [details]
add as files/patch-bootstrap-ocaml.sh

(In reply to Guangyuan Yang from comment #3)

Thanks for your poudriere output. I attached a patch to fix the build, and tested this on my poudriere successfully. The portlint is also happy with the port :)

Created attachment 229318 [details]
Patch for devel/ocaml-opam

This updates the Makefile and distinfo for the latest opam release. It does no longer depend on lang/ocaml (which is at 4.05.0 and too old for compiling opam and its depedencies). Instead, opam-full (the tarball) includes the source of an OCaml compiler (4.12.0). This compiler is built before configure (pre-configure).

Created attachment 229319 [details]
add as files/patch-bootstrap-ocaml.sh

patch generated with make makepatch

I uploaded a new patch replacing the original one -- this passes portlint and a poudriere build (http://193.30.40.133:8080/data/builder-default/2021-11-06_14h08m04s/logs/ocaml-opam-2.1.1.log).

The patch for files/ is still needed, and has be regenerated using make makepatch.

Thanks for your patience.

Created attachment 230310 [details]
Update devel/ocaml-opam to 2.1.2 (patch for Makefile and distinfo)

Hi,

I added a patch to update directly to opam 2.1.2 (instead of 2.1.1). I followed the test procedure from the porters handbook sucessully:

    make stage

    make stage-qa

    make package

    make install

    make deinstall

    make package (as user)

I also ran portlint which reports "looks fine".

In my poudriere, this builds fine: http://193.30.40.133:8080/build.html?mastername=builder-default&build=2021-12-22_11h09m16s log http://193.30.40.133:8080/data/builder-default/2021-12-22_11h09m16s/logs/ocaml-opam-2.1.2.log

It would be great to have this included in this quarterly.

Comment 11 Guangyuan Yang 2021-12-23 01:00:23 UTC

There are some plist issues when I run the Poudriere build:

http://jenkins.ygy.io/job/freebsd-ports-testing-13.0R-amd64/1168/console

Comment 12 Guangyuan Yang 2021-12-23 01:01:45 UTC

===========================================================================
====> Running Q/A tests (stage-qa)
====> Checking for pkg-plist issues (check-plist)
===> Parsing plist
===> Checking for items in STAGEDIR missing from pkg-plist
Error: Orphaned: man/man1/opam-lock.1.gz
Error: Orphaned: man/man1/opam-option.1.gz
===> Checking for items in pkg-plist which are not in STAGEDIR
===> Error: Plist issues found.
*** Error code 1

Stop.
make: stopped in /usr/ports/devel/ocaml-opam
=>> Error: check-plist failures detected

Created attachment 230343 [details]
Update devel/ocaml-opam to 2.1.2 (patch for Makefile and distinfo and pkg-plist)

(In reply to Guangyuan Yang from comment #12)

Thanks for your comment, addressed with the updated https://bugs.freebsd.org/bugzilla/attachment.cgi?id=230343&action=diff -- for some reason my "make stage-qa" does not display these errors.

Comment 15 Guangyuan Yang 2021-12-24 22:36:01 UTC

(In reply to Hannes Mehnert from comment #14)

Build fails for i386 - is this expected?

http://jenkins.ygy.io/job/freebsd-ports-testing-12.2R-i386/1159/console

Created attachment 230392 [details]
Update devel/ocaml-opam to 2.1.2 (complete patch)

(In reply to Guangyuan Yang from comment #15)

Thanks for testing on 32bit. I setup a FreeBSD 32 bit x86 system, and reported the issue upstream (https://github.com/ocaml/ocaml/pull/10835), and included in this issue a patch (now as single patchfile for the entire devel/ocaml-opam port). This works successfully on my 32bit FreeBSD and poudriere on amd64.

Best,

Hannes

Comment 18 commit-hook 2021-12-25 20:46:31 UTC

A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e1d740eccccdf0d3afe982c635c4a5e397881ebd

commit e1d740eccccdf0d3afe982c635c4a5e397881ebd
Author:     Hannes Mehnert <hannes@mehnert.org>
AuthorDate: 2021-12-25 20:45:09 +0000
Commit:     Guangyuan Yang <ygy@FreeBSD.org>
CommitDate: 2021-12-25 20:45:09 +0000

    devel/ocaml-opam: Update to 2.1.2

    Changelog:      https://github.com/ocaml/opam/blob/2.1.2/CHANGES

    PR:             259667

 devel/ocaml-opam/Makefile                          | 10 +++--
 devel/ocaml-opam/distinfo                          |  6 +--
 .../files/patch-shell_bootstrap-ocaml.sh (new)     | 20 ++++++++++
 ...es_0001-Fix-relocation-ocaml-32-bit.patch (new) | 45 ++++++++++++++++++++++
 devel/ocaml-opam/pkg-plist                         |  2 +
 5 files changed, 76 insertions(+), 7 deletions(-)

Comment 19 Guangyuan Yang 2021-12-26 02:19:52 UTC

(In reply to Hannes Mehnert from comment #17)

Committed. Thanks for all the effort!