Re: [ITA] ocaml 4.14.0

[William Hu <purplearmadillo77@proton.me>]

[-- Attachment #1: Type: text/plain, Size: 1121 bytes --]

Hi Jon,

Oops, sorry about that. The patch and updated cygport are now attached.
Sending SSH key shortly.

Thanks,
William

------- Original Message -------
On Monday, July 4th, 2022 at 1:03 PM, Jon Turney <jon.turney@dronecode.org.uk> wrote:


> On 04/07/2022 03:03, William Hu via Cygwin-apps wrote:
>
> > Hello,
> >
> > I noticed that the ocaml source package is currently unmaintained and the most recent package version is 4.10.0, so I'd like to adopt the packages under it (specifically, ocaml, ocaml-compiler-libs, ocaml-runtime, ocaml-doc, ocaml-ocamldoc, and ocaml-source). Attached is a cygport file that I've modified for the newest version 4.14.0. Please let me know if there's anything else that has to be done/changed. Thank you!
>
>
> Thanks!
>
> I wasn't able to test your cygport file as you didn't attach the patch
> it references, but it looks correct:
>
>
> Please consider adding:
>
> LICENSE="LGPL-2.1-or-later"
> BUILD_REQUIRES="flexdll" (I think that's all that's needed?)
>
>
> Please provide a SSH key as explained here:
>
> https://cygwin.com/packaging/key.html

[-- Attachment #2: ocaml.cygport --]
[-- Type: application/octet-stream, Size: 2101 bytes --]

NAME="ocaml"
VERSION=4.14.0
RELEASE=1
CATEGORY="OCaml"
SUMMARY="OCaml compilers"
DESCRIPTION="OCaml is a fast modern type-inferring functional programming
language descended from the ML (Meta Language) family, featuring objects,
modules, and a high-performance native-code compiler. The OCaml compiler is
developed by a worldwide distributed team coordinated by the Gallium
project-team at Inria Paris-Rocquencourt."
HOMEPAGE="https://ocaml.org/"
LICENSE="LGPL-2.1-or-later"
BUILD_REQUIRES="flexdll"
SRC_URI="https://github.com/ocaml/ocaml/archive/${VERSION}.tar.gz"
PATCH_URI="4.14.0-configure-cflags.patch"

OCAML_LIBDIR=/usr/lib/ocaml
KEEPDIRS="${D}/usr/lib/ocaml/ocamldoc/custom"

PKG_NAMES="${NAME} ${NAME}-runtime ${NAME}-compiler-libs ${NAME}-ocamldoc ${NAME}-source ${NAME}-doc"
ocaml_OBSOLETES="ocaml-base emacs-ocaml"
ocaml_REQUIRES="flexdll ${NAME}-runtime"
ocaml_CONTENTS="
	--exclude=camlheader[di].exe
	--exclude=compiler-libs
	--exclude=ocamldoc*
	--exclude=ocamlrun*
	--exclude=stublibs
	--exclude=*.ml
	--exclude=*.cma
	--exclude=*.cmi
	--exclude=*.cmo
	usr/bin/ocaml*
	${OCAML_LIBDIR#/}/
	usr/share/doc/${NAME}/
	usr/share/man/man1/
"
ocaml_runtime_SUMMARY="OCaml bytecode runtime"
ocaml_runtime_CONTENTS="
	usr/bin/ocamlrun*
	${OCAML_LIBDIR#/}/camlheader[di].exe
	${OCAML_LIBDIR#/}/*.cm[aio]
	${OCAML_LIBDIR#/}/stublibs/
	${OCAML_LIBDIR#/}/threads/*.cm[ai]
	usr/share/man/man1/ocamlrun*
"
ocaml_compiler_libs_SUMMARY="OCaml compiler internals"
ocaml_compiler_libs_REQUIRES=${NAME}
ocaml_compiler_libs_CONTENTS="${OCAML_LIBDIR#/}/compiler-libs/"
ocaml_ocamldoc_SUMMARY="OCaml documentation generator"
ocaml_ocamldoc_CONTENTS="
	usr/bin/ocamldoc*
	${OCAML_LIBDIR#/}/ocamldoc/
	usr/share/man/man1/ocamldoc*
"
ocaml_source_SUMMARY="OCaml standard library sources"
ocaml_source_CONTENTS="${OCAML_LIBDIR#/}/*.ml"
ocaml_doc_SUMMARY="OCaml API documentation"
ocaml_doc_CONTENTS="usr/share/man/man3/"

src_compile() {
	lndirs
	cd ${B}
	./configure --prefix=/usr || error "configure failed"
	cygmake
}

src_test() { :
	cd ${B}/testsuite
	cygmake all
}

src_install() {
	cd ${B}
	cyginstall
}

[-- Attachment #3: 4.14.0-configure-cflags.patch --]
[-- Type: application/octet-stream, Size: 401 bytes --]

--- origsrc/ocaml-4.14.0/configure	2022-03-28 08:27:36.000000000 -0400
+++ src/ocaml-4.14.0/configure	2022-06-28 21:29:43.682865800 -0400
@@ -13084,6 +13084,7 @@
     CC="$flexlink -chain $flexdll_chain -exe"
     LIBS="conftest2.$ac_objext"
     CPPFLAGS="$internal_cppflags $CPPFLAGS"
+    CFLAGS=""
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main() { return 0; }