svn commit: r431473 - in head/devel/ocaml-findlib: . files

[Hiroki Sato]

John Marino <freebsd.contact at marino.st> wrote
  in <b2c7d8c9-22f1-5356-37db-436ab922bbee at marino.st>:

fr> > +-		tools/patch '@SITELIB@' '$(OCAML_SITELIB)' >findlib.conf
fr> > ++ tools/patch '@SITELIB@' '$(OCAML_SITELIB):$(OCAML_LIBDIR)'
fr> > >findlib.conf
fr> > + 	if ./tools/cmd_from_same_dir ocamlc; then \
fr> > + 		echo 'ocamlc="ocamlc.opt"' >>findlib.conf; \
fr> > + 	fi
fr>
fr>
fr> I think this change is the direct cause for math/ocaml-zarith failing
fr> on all platforms.  It's expecting a single directory, not a
fr> concatenated series of directories.
fr>
fr> What was this change supposed to address?

 Oh, I did not notice the multiple directory specification broke
 math/ocaml-zarith.  It was because some ocaml libraries use
 OCAML_LIBDIR as the installation directory and findlib does not find
 them on runtime.  The problem is that a wrong directory is used in
 some ports.  I am working on fixing devel/ocaml-* ports after this
 commit and eventually the change in question will be removed.  I will
 take care of math/ocaml-zarith, too.

 lang/ocaml and devel/ocaml-* are under restructuring and I am waiting
 for a reply from the maintainers because ocaml-4.02.3 has a problem
 with some applications such as the latest version of math/coq, and
 upgrading it to ocaml-4.04.0 involves changes of the directory
 layout.  I tried to mitigate the issues by committing temporary fixes
 to findlib first because some of the related ports have its
 maintainer, and I thought I could fix them in a more complete manner
 immediately after receiving the reply.  However, it have not happened
 quickly.  Maintainer timeout is expected this weekend.

fr> > -+ ${BSD_INSTALL_DATA} num_top.cma num_top.cmi num_top_printers.cmi \
fr> > + 	cp num_top.cma num_top.cmi num_top_printers.cmi \
fr> > +-		"$(prefix)$(OCAML_SITELIB)/num-top"
fr> >  +		"$(DESTDIR)$(prefix)$(OCAML_SITELIB)/num-top"
fr> >
fr>
fr>
fr> why were all the standard BSD_INSTALL_* macros replaced with "cp" ??

 Just for reducing the diffs before restructuring.  The original
 change used BSD_INSTALL_DATA even for binaries inconsistently and it
 made impossible to strip the binaries.  Using cp and doing chmod in
 post-install are also ugly but they come from leftover of changes
 before I took the maintainership.  They will be eliminated together
 upon upgrading of lang/ocaml.

-- Hiroki
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20170126/e9478927/attachment.sig>