pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/unison unison: fix build with ocaml-4.06



details:   https://anonhg.NetBSD.org/pkgsrc/rev/62c697ec0bde
branches:  trunk
changeset: 374394:62c697ec0bde
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Jan 22 10:35:44 2018 +0000

description:
unison: fix build with ocaml-4.06

Taken from upstream's v2.48.15v4 release

diffstat:

 net/unison/distinfo                         |   4 ++--
 net/unison/patches/patch-src_Makefile.OCaml |  12 +++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diffs (45 lines):

diff -r c8dded56ff3d -r 62c697ec0bde net/unison/distinfo
--- a/net/unison/distinfo       Mon Jan 22 10:22:30 2018 +0000
+++ b/net/unison/distinfo       Mon Jan 22 10:35:44 2018 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.28 2017/11/14 13:03:35 jaapb Exp $
+$NetBSD: distinfo,v 1.29 2018/01/22 10:35:44 wiz Exp $
 
 SHA1 (unison-2.48.15.tar.gz) = 7a22715321fdd4808d12f9122df9314a45283a18
 RMD160 (unison-2.48.15.tar.gz) = aa98f4fb12e4363c8a51e1969fa829cab7e96869
 SHA512 (unison-2.48.15.tar.gz) = 2614b7291f9d9eb1cb5380560e4883849c6bba449d31e5bc704395291978d41e43208cfff701708a5ae9c9a6a220a8ceb06496fd1e2ab1915bf2f5c36349739f
 Size (unison-2.48.15.tar.gz) = 1912444 bytes
 SHA1 (patch-src_Makefile) = 19cf0b79995c7848bc02d220267be4f3a3e4b59b
-SHA1 (patch-src_Makefile.OCaml) = 3c2168ebffa1b5479577d64113cf5d8c6f9b906e
+SHA1 (patch-src_Makefile.OCaml) = 04681c195b2e7e11f3068960236f3ccd216fa816
 SHA1 (patch-src_fs.ml) = 1d02f83d245466c0aad45a3261bba8149ed3db56
 SHA1 (patch-src_mkProjectInfo.ml) = a1908748dbe4c1db0e2b012e73fe46c6bca30348
 SHA1 (patch-src_system_system_intf.ml) = 89b8598b364bee489b356f9cb3cb297d981b526e
diff -r c8dded56ff3d -r 62c697ec0bde net/unison/patches/patch-src_Makefile.OCaml
--- a/net/unison/patches/patch-src_Makefile.OCaml       Mon Jan 22 10:22:30 2018 +0000
+++ b/net/unison/patches/patch-src_Makefile.OCaml       Mon Jan 22 10:35:44 2018 +0000
@@ -1,6 +1,7 @@
-$NetBSD: patch-src_Makefile.OCaml,v 1.1 2017/11/14 13:03:35 jaapb Exp $
+$NetBSD: patch-src_Makefile.OCaml,v 1.2 2018/01/22 10:35:45 wiz Exp $
 
 Correct lablgtk paths for 2.16, and use ocamlopt.opt for compilation
+Add -unsafe-string for OCaml >= 4.06.
 
 --- src/Makefile.OCaml.orig    2015-10-05 18:14:23.000000000 +0000
 +++ src/Makefile.OCaml
@@ -15,6 +16,15 @@
  ##BCP [3/2007]: Removed temporarily, since the OSX UI is not working well 
  ## at the moment and we don't want to confuse people by building it by default
  ifeq ($(OSARCH),osx)
+@@ -95,7 +95,7 @@ buildexecutable::
+ ### Default parameters
+ 
+ # Generate backtrace information for exceptions
+-CAMLFLAGS+=-g
++CAMLFLAGS+=-g -unsafe-string
+ 
+ INCLFLAGS=-I lwt -I ubase -I system
+ CAMLFLAGS+=$(INCLFLAGS)
 @@ -292,14 +292,14 @@ endif
  
  # Gtk GUI



Home | Main Index | Thread Index | Old Index