diff options
| author | maya <maya@pkgsrc.org> | 2017-08-23 02:57:09 +0000 |
|---|---|---|
| committer | maya <maya@pkgsrc.org> | 2017-08-23 02:57:09 +0000 |
| commit | cfe89ac9c7dfbe7b89966b209762398ee4a709d2 (patch) | |
| tree | 53b7fe5f5ac755f840d4687a732461dfffaaea59 /sysutils/xentools42 | |
| parent | 11b6833b31329b2cb2170a7ea58ba7ba699e5604 (diff) | |
| download | pkgsrc-cfe89ac9c7dfbe7b89966b209762398ee4a709d2.tar.gz | |
Blindly make the same change as xentools45, handle ocaml-findlib appending
destdir. Blind because this package doesn't build due to -Werror and warnings
bump PKGREVISION in case ocaml updates affected things.
Diffstat (limited to 'sysutils/xentools42')
| -rw-r--r-- | sysutils/xentools42/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/xentools42/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/xentools42/patches/patch-ocaml_common.make | 12 |
3 files changed, 15 insertions, 5 deletions
diff --git a/sysutils/xentools42/Makefile b/sysutils/xentools42/Makefile index b80e749d614..47e8fd90487 100644 --- a/sysutils/xentools42/Makefile +++ b/sysutils/xentools42/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.59 2017/07/24 11:37:49 maya Exp $ +# $NetBSD: Makefile,v 1.60 2017/08/23 02:57:09 maya Exp $ VERSION= 4.2.5 VERSION_IPXE= 1.0.0 DISTNAME= xen-${VERSION} PKGNAME= xentools42-${VERSION} -PKGREVISION= 23 +PKGREVISION= 24 CATEGORIES= sysutils MASTER_SITES= https://downloads.xenproject.org/release/xen/${VERSION}/ diff --git a/sysutils/xentools42/distinfo b/sysutils/xentools42/distinfo index 9ced5f53479..8181ccd7dd8 100644 --- a/sysutils/xentools42/distinfo +++ b/sysutils/xentools42/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.33 2017/07/24 11:37:49 maya Exp $ +$NetBSD: distinfo,v 1.34 2017/08/23 02:57:09 maya Exp $ SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485 RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547 @@ -67,7 +67,7 @@ SHA1 (patch-libxl_libxl__create.c) = 1706f782bcd3bea19b8127e9aefe8bda4a4061de SHA1 (patch-libxl_libxl__internal.h) = bc2865f5c14b1fb9df1f9ad77d3be4a1494068c6 SHA1 (patch-libxl_libxl__save__helper.c) = 1592f07e30db119905ae1efa9bd272fa75f60651 SHA1 (patch-libxl_xl.c) = f7ca33eac8ce6c2383d985c82bf8cb406588e2c9 -SHA1 (patch-ocaml_common.make) = a809e3bed475cdffea3cb7ae480c8fe7af6aa798 +SHA1 (patch-ocaml_common.make) = 0cb657ef139c5651ed2a6962a63951ff46e6284f SHA1 (patch-ocaml_libs_xb_xs__ring__stubs.c) = 944ce96d18cefdc70babe83d3337ff94604b0f04 SHA1 (patch-ocaml_xenstored_Makefile) = a0e91b946307a610490a492d4d56dfe426bddb63 SHA1 (patch-ocaml_xenstored_define.ml) = c0772dff8e59f495a0ebe17a905aed04a29f2469 diff --git a/sysutils/xentools42/patches/patch-ocaml_common.make b/sysutils/xentools42/patches/patch-ocaml_common.make index 4c76a03e43e..863540912cb 100644 --- a/sysutils/xentools42/patches/patch-ocaml_common.make +++ b/sysutils/xentools42/patches/patch-ocaml_common.make @@ -1,4 +1,6 @@ -$NetBSD: patch-ocaml_common.make,v 1.2 2015/08/23 16:17:12 spz Exp $ +$NetBSD: patch-ocaml_common.make,v 1.3 2017/08/23 02:57:09 maya Exp $ + +Handle ocaml-findlib 1.7.3 already appending DESTDIR --- ocaml/common.make.orig 2014-09-02 06:22:57.000000000 +0000 +++ ocaml/common.make @@ -11,3 +13,11 @@ $NetBSD: patch-ocaml_common.make,v 1.2 2015/08/23 16:17:12 spz Exp $ OCAMLDEP ?= ocamldep OCAMLLEX ?= ocamllex OCAMLYACC ?= ocamlyacc +@@ -16,6 +16,6 @@ OCAMLCFLAGS += -g $(OCAMLINCLUDE) -w F - + + VERSION := 4.1 + +-OCAMLDESTDIR ?= $(DESTDIR)$(shell ocamlfind printconf destdir) ++OCAMLDESTDIR ?= $(shell ocamlfind printconf destdir) + + o= >$@.new && mv -f $@.new $@ |