kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add support for 64-bit Solaris.

Browse source
This commit is contained in:
jperkin 2012-12-18 12:02:10 +00:00
parent 7b088f67d4
commit 49589b62c8
2 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lang/ocaml/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.66 2012/12/04 13:55:23 jaapb Exp $ $NetBSD: distinfo,v 1.67 2012/12/18 12:02:10 jperkin Exp $
SHA1 (ocaml-4.00.1.tar.bz2) = 10b8a4d0b88d20b003e3dd719f2ac9434e6a1042 SHA1 (ocaml-4.00.1.tar.bz2) = 10b8a4d0b88d20b003e3dd719f2ac9434e6a1042
RMD160 (ocaml-4.00.1.tar.bz2) = db28f57b463af90650b877af0baf44eb226b0a79 RMD160 (ocaml-4.00.1.tar.bz2) = db28f57b463af90650b877af0baf44eb226b0a79
@ -11,7 +11,7 @@ SHA1 (patch-asmrun_signals_osdep.h) = cc7131ef020563ae28c1fddbe8fe634174f73826
SHA1 (patch-bytecomp_bytelink.ml) = 051044bc6f534d3f197d40e6d527e5224a1f166a SHA1 (patch-bytecomp_bytelink.ml) = 051044bc6f534d3f197d40e6d527e5224a1f166a
SHA1 (patch-byterun_Makefile) = 9681ce78c78879d29d9c58f35278a14e6cb18e96 SHA1 (patch-byterun_Makefile) = 9681ce78c78879d29d9c58f35278a14e6cb18e96
SHA1 (patch-camlp4_man_Makefile) = c3a5dc09a2cc15d969c4e074be7da98a979f7db4 SHA1 (patch-camlp4_man_Makefile) = c3a5dc09a2cc15d969c4e074be7da98a979f7db4
SHA1 (patch-configure) = 71c49c38c59350897fe9b0831cfc2bab52b922b4 SHA1 (patch-configure) = 91fe01716545e62c92b4ff54d0a1d15f62b209fc
SHA1 (patch-debugger_Makefile.shared) = 583fa88caf965164aa3b638dda4c2a6e8878bdf9 SHA1 (patch-debugger_Makefile.shared) = 583fa88caf965164aa3b638dda4c2a6e8878bdf9
SHA1 (patch-man_Makefile) = 3f52dd1fcbde53399852a6490d5f27fc7c1c98e5 SHA1 (patch-man_Makefile) = 3f52dd1fcbde53399852a6490d5f27fc7c1c98e5
SHA1 (patch-ocamldoc_Makefile) = d09c5f779dc1da9317d1c6e5eb4b251a9af45562 SHA1 (patch-ocamldoc_Makefile) = d09c5f779dc1da9317d1c6e5eb4b251a9af45562

34
lang/ocaml/patches/patch-configure
View file

@ -1,9 +1,10 @@
$NetBSD: patch-configure,v 1.2 2012/10/26 08:18:15 jaapb Exp $ $NetBSD: patch-configure,v 1.3 2012/12/18 12:02:10 jperkin Exp $
Several configure changes to work on and detect NetBSD (and some other OSes) Several configure changes to work on and detect NetBSD (and some other OSes)
--- configure.orig 2012-06-26 15:33:50.000000000 +0000 --- configure.orig 2012-06-26 15:33:50.000000000 +0000
+++ configure +++ configure 2012-12-18 11:46:04.156290592 +0000
@@ -537,7 +537,7 @@ if test $withsharedlibs = "yes"; then @@ -537,7 +537,7 @@
mksharedlib="$flexlink" mksharedlib="$flexlink"
mkmaindll="$flexlink -maindll" mkmaindll="$flexlink -maindll"
shared_libraries_supported=true;; shared_libraries_supported=true;;
@ -12,7 +13,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
sharedcccompopts="-fPIC" sharedcccompopts="-fPIC"
mksharedlib="$bytecc -shared" mksharedlib="$bytecc -shared"
bytecclinkopts="$bytecclinkopts -Wl,-E" bytecclinkopts="$bytecclinkopts -Wl,-E"
@@ -633,7 +633,7 @@ if test $withsharedlibs = "yes"; then @@ -633,7 +633,7 @@
x86_64-*-linux*) natdynlink=true;; x86_64-*-linux*) natdynlink=true;;
i[3456]86-*-darwin[89].*) natdynlink=true;; i[3456]86-*-darwin[89].*) natdynlink=true;;
i[3456]86-*-darwin*) i[3456]86-*-darwin*)
@ -21,7 +22,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
natdynlink=true natdynlink=true
fi;; fi;;
x86_64-*-darwin*) natdynlink=true;; x86_64-*-darwin*) natdynlink=true;;
@@ -647,6 +647,8 @@ if test $withsharedlibs = "yes"; then @@ -647,6 +647,8 @@
x86_64-*-openbsd*) natdynlink=true;; x86_64-*-openbsd*) natdynlink=true;;
i[345]86-*-netbsd*) natdynlink=true;; i[345]86-*-netbsd*) natdynlink=true;;
x86_64-*-netbsd*) natdynlink=true;; x86_64-*-netbsd*) natdynlink=true;;
@ -30,7 +31,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
i386-*-gnu0.3) natdynlink=true;; i386-*-gnu0.3) natdynlink=true;;
arm*-*-linux*) natdynlink=true;; arm*-*-linux*) natdynlink=true;;
esac esac
@@ -672,6 +674,7 @@ case "$host" in @@ -672,6 +674,7 @@
sparc*-*-gnu*) arch=sparc; system=gnu;; sparc*-*-gnu*) arch=sparc; system=gnu;;
i[3456]86-*-linux*) arch=i386; system=linux_`sh ./runtest elf.c`;; i[3456]86-*-linux*) arch=i386; system=linux_`sh ./runtest elf.c`;;
i[3456]86-*-*bsd*) arch=i386; system=bsd_`sh ./runtest elf.c`;; i[3456]86-*-*bsd*) arch=i386; system=bsd_`sh ./runtest elf.c`;;
@ -38,7 +39,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
i[3456]86-*-nextstep*) arch=i386; system=nextstep;; i[3456]86-*-nextstep*) arch=i386; system=nextstep;;
i[3456]86-*-solaris*) if $arch64; then i[3456]86-*-solaris*) if $arch64; then
arch=amd64; system=solaris arch=amd64; system=solaris
@@ -680,6 +683,7 @@ case "$host" in @@ -680,6 +683,7 @@
fi;; fi;;
i[3456]86-*-beos*) arch=i386; system=beos;; i[3456]86-*-beos*) arch=i386; system=beos;;
i[3456]86-*-cygwin*) arch=i386; system=cygwin;; i[3456]86-*-cygwin*) arch=i386; system=cygwin;;
@ -46,7 +47,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
i[3456]86-*-darwin*) if $arch64; then i[3456]86-*-darwin*) if $arch64; then
arch=amd64; system=macosx arch=amd64; system=macosx
else else
@@ -691,6 +695,7 @@ case "$host" in @@ -691,6 +695,7 @@
powerpc-*-rhapsody*) arch=power; model=ppc; system=rhapsody;; powerpc-*-rhapsody*) arch=power; model=ppc; system=rhapsody;;
powerpc-*-darwin*) arch=power; system=rhapsody powerpc-*-darwin*) arch=power; system=rhapsody
if $arch64; then model=ppc64; else model=ppc; fi;; if $arch64; then model=ppc64; else model=ppc; fi;;
@ -54,15 +55,16 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
arm*-*-linux-gnueabihf) arch=arm; system=linux_eabihf;; arm*-*-linux-gnueabihf) arch=arm; system=linux_eabihf;;
armv7*-*-linux-gnueabi) arch=arm; model=armv7; system=linux_eabi;; armv7*-*-linux-gnueabi) arch=arm; model=armv7; system=linux_eabi;;
armv6t2*-*-linux-gnueabi) arch=arm; model=armv6t2; system=linux_eabi;; armv6t2*-*-linux-gnueabi) arch=arm; model=armv6t2; system=linux_eabi;;
@@ -702,6 +707,7 @@ case "$host" in @@ -702,6 +707,8 @@
x86_64-*-gnu*) arch=amd64; system=gnu;; x86_64-*-gnu*) arch=amd64; system=gnu;;
x86_64-*-freebsd*) arch=amd64; system=freebsd;; x86_64-*-freebsd*) arch=amd64; system=freebsd;;
x86_64-*-netbsd*) arch=amd64; system=netbsd;; x86_64-*-netbsd*) arch=amd64; system=netbsd;;
+ x86_64-*-dragonfly*) arch=amd64; system=dragonfly;; + x86_64-*-dragonfly*) arch=amd64; system=dragonfly;;
+ x86_64-*-solaris*) arch=amd64; system=solaris;;
x86_64-*-openbsd*) arch=amd64; system=openbsd;; x86_64-*-openbsd*) arch=amd64; system=openbsd;;
x86_64-*-darwin*) arch=amd64; system=macosx;; x86_64-*-darwin*) arch=amd64; system=macosx;;
esac esac
@@ -736,7 +742,7 @@ case "$arch,$nativecc,$system,$host_type @@ -736,7 +743,7 @@
if $arch64; then partialld="ld -r -arch ppc64"; fi;; if $arch64; then partialld="ld -r -arch ppc64"; fi;;
*,gcc*,cygwin,*) nativecccompopts="$gcc_warnings -U_WIN32";; *,gcc*,cygwin,*) nativecccompopts="$gcc_warnings -U_WIN32";;
amd64,gcc*,macosx,*) partialld="ld -r -arch x86_64";; amd64,gcc*,macosx,*) partialld="ld -r -arch x86_64";;
@ -71,7 +73,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
*,gcc*,*,*) nativecccompopts="$gcc_warnings";; *,gcc*,*,*) nativecccompopts="$gcc_warnings";;
esac esac
@@ -752,7 +758,7 @@ case "$arch,$model,$system" in @@ -752,7 +759,7 @@
arm,*,*) as='as'; arm,*,*) as='as';
aspp='gcc -c';; aspp='gcc -c';;
i386,*,solaris) as='as' i386,*,solaris) as='as'
@ -80,7 +82,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
i386,*,*) as='as' i386,*,*) as='as'
aspp='gcc -c';; aspp='gcc -c';;
power,*,elf) as='as -u -m ppc' power,*,elf) as='as -u -m ppc'
@@ -786,6 +792,8 @@ case "$arch,$model,$system" in @@ -786,6 +793,8 @@
amd64,*,linux) profiling='prof';; amd64,*,linux) profiling='prof';;
amd64,*,gnu) profiling='prof';; amd64,*,gnu) profiling='prof';;
arm,*,linux*) profiling='prof';; arm,*,linux*) profiling='prof';;
@ -89,7 +91,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
*) profiling='noprof';; *) profiling='noprof';;
esac esac
@@ -1244,6 +1252,8 @@ fi @@ -1244,6 +1253,8 @@
x11_include="not found" x11_include="not found"
x11_link="not found" x11_link="not found"
@ -98,7 +100,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
if test -z "$x11_include_dir" -a -z "$x11_lib_dir"; then if test -z "$x11_include_dir" -a -z "$x11_lib_dir"; then
if pkg-config --exists x11 2>/dev/null; then if pkg-config --exists x11 2>/dev/null; then
x11_include=`pkg-config --cflags x11` x11_include=`pkg-config --cflags x11`
@@ -1290,6 +1300,7 @@ if test "$x11_include" = "not found"; th @@ -1290,6 +1301,7 @@
/usr/XFree86/include/X11 \ /usr/XFree86/include/X11 \
\ \
/usr/include \ /usr/include \
@ -106,7 +108,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
/usr/local/include \ /usr/local/include \
/usr/unsupported/include \ /usr/unsupported/include \
/usr/athena/include \ /usr/athena/include \
@@ -1347,6 +1358,7 @@ if test "$x11_include" = "not found"; th @@ -1347,6 +1359,7 @@
\ \
/usr/lib64 \ /usr/lib64 \
/usr/lib \ /usr/lib \
@ -114,7 +116,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
/usr/local/lib \ /usr/local/lib \
/usr/unsupported/lib \ /usr/unsupported/lib \
/usr/athena/lib \ /usr/athena/lib \
@@ -1368,18 +1380,16 @@ if test "$x11_include" = "not found"; th @@ -1368,18 +1381,16 @@
if test $dir = /usr/lib; then if test $dir = /usr/lib; then
x11_link="-lX11" x11_link="-lX11"
else else