From 7ea37d4736ceabf4adb36ef7ce97eb145063b02f Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 21 Apr 2020 14:46:59 +0200 Subject: [PATCH] zeroinstall: use system ocaml this unbreaks build on a bunch of platforms --- srcpkgs/zeroinstall/template | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template index dfdc541066..e7c3a9fde9 100644 --- a/srcpkgs/zeroinstall/template +++ b/srcpkgs/zeroinstall/template @@ -1,11 +1,11 @@ # Template file for 'zeroinstall' pkgname=zeroinstall version=2.16 -revision=1 +revision=2 wrksrc="0install-v${version}" build_style=gnu-makefile make_install_target="install_system" -hostmakedepends="gettext opam m4 tar pkg-config which" +hostmakedepends="gettext ocaml opam m4 tar pkg-config which" makedepends="libressl-devel libcurl-devel gnupg glib-devel gtk+3-devel" depends="gnupg desktop-file-utils hicolor-icon-theme xdg-utils" short_desc="Cross-distribution software installation system" @@ -17,8 +17,13 @@ checksum=4a040cd8ab3a55a84f8daec48306b45d9c9662860fe003c927ef8b485cdecef3 nocross="opam is nocross" disable_parallel_build=yes +case "$XBPS_TARGET_MACHINE" in + ppc64*) ;; + ppc*) broken="relocation out of range";; +esac + pre_build() { - opam init -y --compiler=4.07.0 --disable-sandboxing + opam init -y --compiler=ocaml-system --disable-sandboxing eval $(opam env) opam install -y yojson xmlm ounit lwt lwt_react obus ocurl sha dune lablgtk3 lwt_glib }