openbsd-ports/lang/ocaml/patches/patch-configure
avsm 0ffcd882eb update to ocaml-4.00.0
- uses new ocaml_native and ocaml_native_dynlink arch properties
- changelog: http://caml.inria.fr/pub/distrib/ocaml-4.00/notes/Changes

From Christopher Zimmermann <madroach@gmerlin.de> with fixes from me
2012-08-18 21:49:16 +00:00

62 lines
3.0 KiB
Plaintext

$OpenBSD: patch-configure,v 1.15 2012/08/18 21:49:16 avsm Exp $
--- configure.orig Tue Jun 26 17:33:50 2012
+++ configure Mon Jul 30 12:28:54 2012
@@ -641,11 +641,11 @@ if test $withsharedlibs = "yes"; then
sparc*-*-linux*) natdynlink=true;;
i686-*-kfreebsd*) natdynlink=true;;
x86_64-*-kfreebsd*) natdynlink=true;;
- i[345]86-*-freebsd*) natdynlink=true;;
+ i[3456]86-*-freebsd*) natdynlink=true;;
x86_64-*-freebsd*) natdynlink=true;;
- i[345]86-*-openbsd*) natdynlink=true;;
+ i[3456]86-*-openbsd*) natdynlink=true;;
x86_64-*-openbsd*) natdynlink=true;;
- i[345]86-*-netbsd*) natdynlink=true;;
+ i[3456]86-*-netbsd*) natdynlink=true;;
x86_64-*-netbsd*) natdynlink=true;;
i386-*-gnu0.3) natdynlink=true;;
arm*-*-linux*) natdynlink=true;;
@@ -688,10 +688,13 @@ case "$host" in
i[3456]86-*-gnu*) arch=i386; system=gnu;;
powerpc*-*-linux*) arch=power; model=ppc; system=elf;;
powerpc-*-netbsd*) arch=power; model=ppc; system=elf;;
+ powerpc-*-openbsd*) arch=power; model=ppc; system=elf;;
powerpc-*-rhapsody*) arch=power; model=ppc; system=rhapsody;;
powerpc-*-darwin*) arch=power; system=rhapsody
if $arch64; then model=ppc64; else model=ppc; fi;;
arm*-*-linux-gnueabihf) arch=arm; system=linux_eabihf;;
+ arm*-*-openbsd*) arch=arm; system=openbsd;;
+ zaurus*-*-openbsd*) arch=arm; system=openbsd;;
armv7*-*-linux-gnueabi) arch=arm; model=armv7; system=linux_eabi;;
armv6t2*-*-linux-gnueabi) arch=arm; model=armv6t2; system=linux_eabi;;
armv6*-*-linux-gnueabi) arch=arm; model=armv6; system=linux_eabi;;
@@ -780,10 +783,13 @@ case "$arch,$model,$system" in
i386,*,bsd_elf) profiling='prof';;
amd64,*,macosx) profiling='prof';;
i386,*,macosx) profiling='prof';;
+ sparc,*,bsd) profiling='prof';;
sparc,*,solaris)
profiling='prof'
case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;;
amd64,*,linux) profiling='prof';;
+ amd64,*,openbsd) profiling='prof';;
+ power,*,elf) profiling='prof';;
amd64,*,gnu) profiling='prof';;
arm,*,linux*) profiling='prof';;
*) profiling='noprof';;
@@ -1543,11 +1549,11 @@ fi
# Look for BFD library
-if ./hasgot -i bfd.h && \
- ./hasgot -lbfd -ldl -liberty -lz bfd_openr; then
+if ./hasgot -I${OPENBSD_LOCALBASE}/include -i bfd.h && \
+ ./hasgot -L${OPENBSD_LOCALBASE}/lib -lbfd -liberty -lz bfd_openr; then
echo "BFD library found."
echo "#define HAS_LIBBFD" >> s.h
- echo "LIBBFD_LINK=-lbfd -ldl -liberty -lz" >> Makefile
+ echo "LIBBFD_LINK=-I${OPENBSD_LOCALBASE}/include -L${OPENBSD_LOCALBASE}/lib -lbfd -liberty -lz" >> Makefile
else
echo "BFD library not found, 'objinfo' will be unable to display info on .cmxs files"
echo "LIBBFD_LINK=" >> Makefile