CVS commit: pkgsrc/lang/ocaml

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Mar 27 12:54:59 UTC 2017

Modified Files:
        pkgsrc/lang/ocaml: Makefile distinfo
        pkgsrc/lang/ocaml/patches: patch-configure

Log Message:
Enable profiling on SunOS/x86_64.  Note to DragonFly developers that the
existing patch for enabling profiling for that platform is clearly
incorrect, but I'm not going to change it without being able to test it.


To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 pkgsrc/lang/ocaml/Makefile
cvs rdiff -u -r1.102 -r1.103 pkgsrc/lang/ocaml/distinfo
cvs rdiff -u -r1.21 -r1.22 pkgsrc/lang/ocaml/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/ocaml/Makefile
diff -u pkgsrc/lang/ocaml/Makefile:1.107 pkgsrc/lang/ocaml/Makefile:1.108
--- pkgsrc/lang/ocaml/Makefile:1.107    Mon Mar 27 11:51:30 2017
+++ pkgsrc/lang/ocaml/Makefile  Mon Mar 27 12:54:59 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.107 2017/03/27 11:51:30 jperkin Exp $
+# $NetBSD: Makefile,v 1.108 2017/03/27 12:54:59 jperkin Exp $
 
 .include "Makefile.common"
 
@@ -34,7 +34,6 @@ BUILD_TARGET+=        opt opt.opt
 PLIST_SRC+=    ${PKGDIR}/PLIST.opt
 .  if empty(MACHINE_PLATFORM:MDarwin-*-powerpc) && \
       empty(MACHINE_PLATFORM:MSunOS-*-i386) && \
-      empty(MACHINE_PLATFORM:MSunOS-*-x86_64) && \
       empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) && \
       empty(MACHINE_PLATFORM:MNetBSD-*-arm) && \
       empty(MACHINE_PLATFORM:MNetBSD-*-sparc)

Index: pkgsrc/lang/ocaml/distinfo
diff -u pkgsrc/lang/ocaml/distinfo:1.102 pkgsrc/lang/ocaml/distinfo:1.103
--- pkgsrc/lang/ocaml/distinfo:1.102    Thu Mar 23 18:22:34 2017
+++ pkgsrc/lang/ocaml/distinfo  Mon Mar 27 12:54:59 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.102 2017/03/23 18:22:34 jperkin Exp $
+$NetBSD: distinfo,v 1.103 2017/03/27 12:54:59 jperkin Exp $
 
 SHA1 (ocaml-4.04.0.tar.gz) = 49c4d406f5eb4dc2d8ac006103f2bc459fa5a5a6
 RMD160 (ocaml-4.04.0.tar.gz) = 98cbfac14cf93983ae62bfa2042058d0af1734bd
@@ -8,7 +8,7 @@ SHA1 (patch-Makefile) = 426d2aa080922fb6
 SHA1 (patch-asmcomp_asmlink.ml) = db2b387ea17f41a62c2bce53b91f945d5e29a82f
 SHA1 (patch-asmrun_Makefile) = 923b46ebf5fb56693b8335787846dafda936b34c
 SHA1 (patch-byterun_Makefile) = b9b14b097904fbde4b738b89461991411e985ae1
-SHA1 (patch-configure) = ffe90a8b28bcccbdeb11882fe7920110785d1084
+SHA1 (patch-configure) = b3004e40d2337c50c49337f2c7964d469ba99e5c
 SHA1 (patch-debugger_Makefile.shared) = f0aac2e10b7ccf2e8e43bbbd3fd3e59e4dc4eeae
 SHA1 (patch-driver_compenv.ml) = 658e315bb08f8a1093f11c8474ac1e4ad73c8306
 SHA1 (patch-driver_main.ml) = 69a6f761ded38e0721a7aed1416a9f19a288d991

Index: pkgsrc/lang/ocaml/patches/patch-configure
diff -u pkgsrc/lang/ocaml/patches/patch-configure:1.21 pkgsrc/lang/ocaml/patches/patch-configure:1.22
--- pkgsrc/lang/ocaml/patches/patch-configure:1.21      Thu Mar 23 18:22:34 2017
+++ pkgsrc/lang/ocaml/patches/patch-configure   Mon Mar 27 12:54:59 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.21 2017/03/23 18:22:34 jperkin Exp $
+$NetBSD: patch-configure,v 1.22 2017/03/27 12:54:59 jperkin Exp $
 
 All kinds of OS-specific changes to configure
 --- configure.orig     2016-11-04 16:08:24.000000000 +0000
@@ -90,15 +90,16 @@ All kinds of OS-specific changes to conf
    power,elf)      if $arch64; then
                      as="${TOOLPREF}as -a64 -mppc64"
                      aspp="${TOOLPREF}gcc -m64 -c"
-@@ -991,6 +995,7 @@ case "$arch,$system" in
+@@ -991,6 +995,8 @@ case "$arch,$system" in
    arm,linux*) profiling='prof';;
    power,elf) profiling='prof';;
    power,bsd*) profiling='prof';;
-+      *,*,dragonfly) profiling='prof';;
++  *,*,dragonfly) profiling='prof';;
++  amd64,solaris) profiling='prof';;
    *) profiling='noprof';;
  esac
  
-@@ -1554,6 +1559,8 @@ fi
+@@ -1554,6 +1560,8 @@ fi
  x11_include="not found"
  x11_link="not found"
  
@@ -107,7 +108,7 @@ All kinds of OS-specific changes to conf
  if test -z "$x11_include_dir" -a -z "$x11_lib_dir"; then
    if pkg-config --exists x11 2>/dev/null; then
      x11_include=`pkg-config --cflags x11`
-@@ -1600,6 +1607,7 @@ if test "$x11_include" = "not found"; th
+@@ -1600,6 +1608,7 @@ if test "$x11_include" = "not found"; th
      /usr/XFree86/include/X11  \
                                \
      /usr/include              \
@@ -115,7 +116,7 @@ All kinds of OS-specific changes to conf
      /usr/local/include        \
      /usr/unsupported/include  \
      /usr/athena/include       \
-@@ -1657,6 +1665,7 @@ if test "$x11_include" = "not found"; th
+@@ -1657,6 +1666,7 @@ if test "$x11_include" = "not found"; th
                            \
      /usr/lib64            \
      /usr/lib              \
@@ -123,7 +124,7 @@ All kinds of OS-specific changes to conf
      /usr/local/lib        \
      /usr/unsupported/lib  \
      /usr/athena/lib       \
-@@ -1678,19 +1687,16 @@ if test "$x11_include" = "not found"; th
+@@ -1678,19 +1688,16 @@ if test "$x11_include" = "not found"; th
        if test $dir = /usr/lib; then
          x11_link="-lX11"
        else