diff options
author | jaapb <jaapb@pkgsrc.org> | 2019-01-07 18:52:23 +0000 |
---|---|---|
committer | jaapb <jaapb@pkgsrc.org> | 2019-01-07 18:52:23 +0000 |
commit | a8b18ee5769380036406a515ad6f01fb35cc406c (patch) | |
tree | 8833e20c0bfeb5178650d0f7f011ede0a21f5dec /lang/ocaml/patches | |
parent | 2ad87881f5a00c15e3fb57890f94d282c5ae916a (diff) | |
download | pkgsrc-a8b18ee5769380036406a515ad6f01fb35cc406c.tar.gz |
Updated lang/ocaml to compile on aarch64 and revbump.
A few patches to the configure script to recognise the combination of
NetBSD and aarch64, and a few changes to the Makefile to make sure we've
got the right combination of options for the PLIST. It now compiles on my
Pinebook.
Diffstat (limited to 'lang/ocaml/patches')
-rw-r--r-- | lang/ocaml/patches/patch-configure | 37 |
1 files changed, 23 insertions, 14 deletions
diff --git a/lang/ocaml/patches/patch-configure b/lang/ocaml/patches/patch-configure index 5edaafaee1d..e593235735b 100644 --- a/lang/ocaml/patches/patch-configure +++ b/lang/ocaml/patches/patch-configure @@ -1,8 +1,8 @@ -$NetBSD: patch-configure,v 1.34 2018/07/19 12:16:38 jaapb Exp $ +$NetBSD: patch-configure,v 1.35 2019/01/07 18:52:23 jaapb Exp $ All kinds of OS-specific changes to configure Honor LDFLAGS. ---- configure.orig 2018-04-11 13:22:42.000000000 +0000 +--- configure.orig 2018-10-04 14:23:12.000000000 +0000 +++ configure @@ -797,7 +797,7 @@ sharedcccompopts='' mksharedlib='shared-libs-not-available' @@ -52,7 +52,7 @@ Honor LDFLAGS. x86_64-*-darwin*) natdynlink=true;; s390x*-*-linux*) natdynlink=true;; powerpc*-*-linux*) natdynlink=true;; -@@ -922,6 +921,9 @@ if $with_sharedlibs; then +@@ -922,12 +921,16 @@ if $with_sharedlibs; then x86_64-*-openbsd*) natdynlink=true;; i[3456]86-*-netbsd*) natdynlink=true;; x86_64-*-netbsd*) natdynlink=true;; @@ -62,7 +62,14 @@ Honor LDFLAGS. i386-*-gnu0.3) natdynlink=true;; i[3456]86-*-haiku*) natdynlink=true;; arm*-*-linux*) natdynlink=true;; -@@ -965,6 +967,7 @@ case "$target" in + arm*-*-freebsd*) natdynlink=true;; + earm*-*-netbsd*) natdynlink=true;; + aarch64-*-linux*) natdynlink=true;; ++ aarch64-*-netbsd*) natdynlink=true;; + esac + fi + +@@ -965,6 +968,7 @@ case "$target" in i[3456]86-*-haiku*) arch=i386; system=beos;; i[3456]86-*-beos*) arch=i386; system=beos;; i[3456]86-*-cygwin*) arch=i386; system=cygwin;; @@ -70,7 +77,7 @@ Honor LDFLAGS. i[3456]86-*-darwin*) if $arch64; then arch=amd64; system=macosx else -@@ -987,6 +990,8 @@ case "$target" in +@@ -987,6 +991,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;; @@ -79,15 +86,17 @@ Honor LDFLAGS. 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;; -@@ -1004,6 +1009,7 @@ case "$target" in +@@ -1003,7 +1009,9 @@ case "$target" in + x86_64-*-darwin*) arch=amd64; system=macosx;; x86_64-*-mingw*) arch=amd64; system=mingw;; aarch64-*-linux*) arch=arm64; system=linux;; ++ aarch64-*-netbsd*) arch=arm64; system=netbsd;; x86_64-*-cygwin*) arch=amd64; system=cygwin;; + x86_64-*-solaris*) arch=amd64; system=solaris;; esac # Some platforms exist both in 32-bit and 64-bit variants, not distinguished -@@ -1027,7 +1033,6 @@ nativeccprofopts='' +@@ -1027,7 +1035,6 @@ nativeccprofopts='' case "$arch,$cc,$system,$model" in *,*,rhapsody,*) if $arch64; then partialld="ld -r -arch ppc64"; fi;; amd64,gcc*,macosx,*) partialld="ld -r -arch x86_64";; @@ -95,7 +104,7 @@ Honor LDFLAGS. 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";; -@@ -1045,8 +1050,8 @@ case "$arch,$system" in +@@ -1045,8 +1052,8 @@ case "$arch,$system" in fi;; amd64,solaris) as="${TOOLPREF}as --64" aspp="${TOOLPREF}gcc -m64 -c";; @@ -106,7 +115,7 @@ Honor LDFLAGS. power,elf) if $arch64; then as="${TOOLPREF}as -a64 -mppc64" aspp="${TOOLPREF}gcc -m64 -c" -@@ -1094,6 +1099,8 @@ case "$arch,$system" in +@@ -1094,6 +1101,8 @@ case "$arch,$system" in power,elf) profiling='true';; power,bsd*) profiling='true';; power,netbsd) profiling='true';; @@ -115,7 +124,7 @@ Honor LDFLAGS. *) profiling='false';; esac -@@ -1672,6 +1679,8 @@ fi +@@ -1672,6 +1681,8 @@ fi x11_include="not found" x11_link="not found" @@ -124,7 +133,7 @@ Honor LDFLAGS. 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` -@@ -1718,6 +1727,7 @@ if test "$x11_include" = "not found"; th +@@ -1718,6 +1729,7 @@ if test "$x11_include" = "not found"; th /usr/XFree86/include/X11 \ \ /usr/include \ @@ -132,7 +141,7 @@ Honor LDFLAGS. /usr/local/include \ /usr/unsupported/include \ /usr/athena/include \ -@@ -1775,6 +1785,7 @@ if test "$x11_include" = "not found"; th +@@ -1775,6 +1787,7 @@ if test "$x11_include" = "not found"; th \ /usr/lib64 \ /usr/lib \ @@ -140,7 +149,7 @@ Honor LDFLAGS. /usr/local/lib \ /usr/unsupported/lib \ /usr/athena/lib \ -@@ -1798,18 +1809,16 @@ if test "$x11_include" = "not found"; th +@@ -1798,18 +1811,16 @@ if test "$x11_include" = "not found"; th if test $dir = /usr/lib; then x11_link="-lX11" else @@ -163,7 +172,7 @@ Honor LDFLAGS. if test "$x11_include" != "not found"; then if test "$x11_include" = "-I/usr/include"; then x11_include="" -@@ -2060,7 +2069,7 @@ config CFLAGS "$common_cflags $internal_ +@@ -2060,7 +2071,7 @@ config CFLAGS "$common_cflags $internal_ config CPPFLAGS "$common_cppflags $internal_cppflags" config OCAMLC_CFLAGS "$common_cflags $sharedcccompopts" config OCAMLC_CPPFLAGS "$common_cppflags" |