Received: by mail.netbsd.org (Postfix, from userid 605) id 50FC8856C4; Wed, 15 Nov 2017 12:52:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D146284DC9 for ; Wed, 15 Nov 2017 12:52:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id wKccrrgSGV_K for ; Wed, 15 Nov 2017 12:52:16 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 2BD9884D3D for ; Wed, 15 Nov 2017 12:52:16 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 2218DFB3E; Wed, 15 Nov 2017 12:52:16 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_151075033638920" MIME-Version: 1.0 Date: Wed, 15 Nov 2017 12:52:16 +0000 From: "Greg Troxel" Subject: CVS commit: pkgsrc/lang/ocaml To: pkgsrc-changes@NetBSD.org Reply-To: gdt@netbsd.org X-Mailer: log_accum Message-Id: <20171115125216.2218DFB3E@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_151075033638920 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: gdt Date: Wed Nov 15 12:52:16 UTC 2017 Modified Files: pkgsrc/lang/ocaml: Makefile distinfo pkgsrc/lang/ocaml/patches: patch-configure Log Message: ocaml: Recognize NetBSD armv6 correctly in configure While MACHINE_ARCH can be earmv6hf on NetBSD, configure has to match what config.guess outputs, which is armv6. For now, leave the old earmv6/7 tokens, because this code inexplicably succeeded on earmv7hf. With this, ocaml builds and builds a working unison, on earmv6hf (RPI3). To generate a diff of this commit: cvs rdiff -u -r1.115 -r1.116 pkgsrc/lang/ocaml/Makefile cvs rdiff -u -r1.113 -r1.114 pkgsrc/lang/ocaml/distinfo cvs rdiff -u -r1.26 -r1.27 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. --_----------=_151075033638920 Content-Disposition: inline Content-Length: 6400 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/ocaml/Makefile diff -u pkgsrc/lang/ocaml/Makefile:1.115 pkgsrc/lang/ocaml/Makefile:1.116 --- pkgsrc/lang/ocaml/Makefile:1.115 Tue Oct 10 12:10:05 2017 +++ pkgsrc/lang/ocaml/Makefile Wed Nov 15 12:52:15 2017 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.115 2017/10/10 12:10:05 he Exp $ +# $NetBSD: Makefile,v 1.116 2017/11/15 12:52:15 gdt Exp $ .include "Makefile.common" -PKGREVISION= 1 +PKGREVISION= 2 CONFIGURE_ENV+= disable_x11=yes Index: pkgsrc/lang/ocaml/distinfo diff -u pkgsrc/lang/ocaml/distinfo:1.113 pkgsrc/lang/ocaml/distinfo:1.114 --- pkgsrc/lang/ocaml/distinfo:1.113 Fri Oct 27 23:30:07 2017 +++ pkgsrc/lang/ocaml/distinfo Wed Nov 15 12:52:15 2017 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.113 2017/10/27 23:30:07 khorben Exp $ +$NetBSD: distinfo,v 1.114 2017/11/15 12:52:15 gdt Exp $ SHA1 (ocaml-4.05.0.tar.gz) = ef9e3febed311cf9331baefd2999961b36f849cb RMD160 (ocaml-4.05.0.tar.gz) = 67b299c3abe032f955e95eac106c32664351453c @@ -9,7 +9,7 @@ SHA1 (patch-asmcomp_asmlink.ml) = db2b38 SHA1 (patch-asmrun_Makefile) = 86c88be262ae1278ca376d7966b496b49c549e72 SHA1 (patch-asmrun_signals__osdep.h) = fa0c6981ca08d1114a377df1720ad866b94eff43 SHA1 (patch-byterun_Makefile) = 28b8298093a439fe1418dc91bb8a06da9870bfab -SHA1 (patch-configure) = 7022f94813bbb49d4e4d87228b4de19b28065c1a +SHA1 (patch-configure) = c0612af8680c5b264fc38741d13704509e7181cf SHA1 (patch-driver_compenv.ml) = 658e315bb08f8a1093f11c8474ac1e4ad73c8306 SHA1 (patch-driver_main.ml) = 69a6f761ded38e0721a7aed1416a9f19a288d991 SHA1 (patch-driver_main_args.ml) = 4c6a6ec25f433974f9aab99b4f2ac9c884bb3b04 Index: pkgsrc/lang/ocaml/patches/patch-configure diff -u pkgsrc/lang/ocaml/patches/patch-configure:1.26 pkgsrc/lang/ocaml/patches/patch-configure:1.27 --- pkgsrc/lang/ocaml/patches/patch-configure:1.26 Tue Oct 17 08:26:48 2017 +++ pkgsrc/lang/ocaml/patches/patch-configure Wed Nov 15 12:52:15 2017 @@ -1,4 +1,4 @@ -$NetBSD: patch-configure,v 1.26 2017/10/17 08:26:48 wiz Exp $ +$NetBSD: patch-configure,v 1.27 2017/11/15 12:52:15 gdt Exp $ All kinds of OS-specific changes to configure @@ -73,7 +73,16 @@ All kinds of OS-specific changes to conf powerpc-*-openbsd*) arch=power; model=ppc; system=bsd_elf;; s390x*-*-linux*) arch=s390x; model=z10; system=elf;; armv6*-*-linux-gnueabihf) arch=arm; model=armv6; system=linux_eabihf;; -@@ -947,6 +951,7 @@ case "$target" in +@@ -930,6 +934,8 @@ case "$target" in + armv6t2*-*-linux-gnueabi) arch=arm; model=armv6t2; system=linux_eabi;; + armv6*-*-linux-gnueabi) arch=arm; model=armv6; system=linux_eabi;; + armv6*-*-freebsd*) arch=arm; model=armv6; system=freebsd;; ++ armv6-*-netbsdelf*) arch=arm; model=armv6; system=netbsd;; ++ armv7-*-netbsdelf*) arch=arm; model=armv7; system=netbsd;; + earmv6*-*-netbsd*) arch=arm; model=armv6; system=netbsd;; + earmv7*-*-netbsd*) arch=arm; model=armv7; system=netbsd;; + armv5te*-*-linux-gnueabi) arch=arm; model=armv5te; system=linux_eabi;; +@@ -947,6 +953,7 @@ case "$target" in x86_64-*-mingw*) arch=amd64; system=mingw;; aarch64-*-linux*) arch=arm64; system=linux;; x86_64-*-cygwin*) arch=amd64; system=cygwin;; @@ -81,7 +90,7 @@ All kinds of OS-specific changes to conf esac # Some platforms exist both in 32-bit and 64-bit variants, not distinguished -@@ -983,7 +988,6 @@ case "$arch,$nativecc,$system,$model" in +@@ -983,7 +990,6 @@ case "$arch,$nativecc,$system,$model" in *,*,nextstep,*) nativecclinkopts="-posix";; *,*,rhapsody,*) if $arch64; then partialld="ld -r -arch ppc64"; fi;; amd64,gcc*,macosx,*) partialld="ld -r -arch x86_64";; @@ -89,7 +98,7 @@ All kinds of OS-specific changes to conf power,gcc*,elf,ppc) partialld="ld -r -m elf32ppclinux";; power,gcc*,elf,ppc64) partialld="ld -r -m elf64ppc";; power,gcc*,elf,ppc64le) partialld="ld -r -m elf64lppc";; -@@ -1001,8 +1005,8 @@ case "$arch,$system" in +@@ -1001,8 +1007,8 @@ case "$arch,$system" in fi;; amd64,solaris) as="${TOOLPREF}as --64" aspp="${TOOLPREF}gcc -m64 -c";; @@ -100,7 +109,7 @@ All kinds of OS-specific changes to conf power,elf) if $arch64; then as="${TOOLPREF}as -a64 -mppc64" aspp="${TOOLPREF}gcc -m64 -c" -@@ -1023,7 +1027,7 @@ case "$arch,$system" in +@@ -1023,7 +1029,7 @@ case "$arch,$system" in aspp="${TOOLPREF}cc -c";; *,freebsd) as="${TOOLPREF}as" aspp="${TOOLPREF}cc -c";; @@ -109,7 +118,7 @@ All kinds of OS-specific changes to conf as="${TOOLPREF}as" case "$ccfamily" in clang-*) -@@ -1058,6 +1062,9 @@ case "$arch,$system" in +@@ -1058,6 +1064,9 @@ case "$arch,$system" in arm,linux*) profiling='true';; power,elf) profiling='true';; power,bsd*) profiling='true';; @@ -119,7 +128,7 @@ All kinds of OS-specific changes to conf *) profiling='false';; esac -@@ -1652,6 +1659,8 @@ fi +@@ -1652,6 +1661,8 @@ fi x11_include="not found" x11_link="not found" @@ -128,7 +137,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` -@@ -1698,6 +1707,7 @@ if test "$x11_include" = "not found"; th +@@ -1698,6 +1709,7 @@ if test "$x11_include" = "not found"; th /usr/XFree86/include/X11 \ \ /usr/include \ @@ -136,7 +145,7 @@ All kinds of OS-specific changes to conf /usr/local/include \ /usr/unsupported/include \ /usr/athena/include \ -@@ -1755,6 +1765,7 @@ if test "$x11_include" = "not found"; th +@@ -1755,6 +1767,7 @@ if test "$x11_include" = "not found"; th \ /usr/lib64 \ /usr/lib \ @@ -144,7 +153,7 @@ All kinds of OS-specific changes to conf /usr/local/lib \ /usr/unsupported/lib \ /usr/athena/lib \ -@@ -1776,19 +1787,16 @@ if test "$x11_include" = "not found"; th +@@ -1776,19 +1789,16 @@ if test "$x11_include" = "not found"; th if test $dir = /usr/lib; then x11_link="-lX11" else --_----------=_151075033638920--