openbsd-ports/lang/ocaml/patches/patch-configure
dcoppa 583c7edd47 Fix build on amd64.
Problem reported by landry@ and kili@.

OK landry@
2010-12-17 18:42:04 +00:00

64 lines
2.8 KiB
Plaintext

$OpenBSD: patch-configure,v 1.14 2010/12/17 18:42:04 dcoppa Exp $
--- configure.orig Wed Jul 28 15:18:22 2010
+++ configure Thu Nov 18 10:07:33 2010
@@ -629,6 +629,8 @@ if test $withsharedlibs = "yes"; then
i686-*-kfreebsd*) natdynlink=true;;
x86_64-*-kfreebsd*) natdynlink=true;;
i386-*-gnu0.3) natdynlink=true;;
+ i[3456]86-*-openbsd*) natdynlink=true;;
+ x86_64-*-openbsd*) natdynlink=true;;
esac
fi
@@ -674,6 +676,7 @@ case "$host" in
fi;;
i[3456]86-*-gnu*) arch=i386; system=gnu;;
mips-*-irix6*) arch=mips; system=irix;;
+ mips*-*-openbsd*) arch=mips; system=openbsd;;
hppa1.1-*-hpux*) arch=hppa; system=hpux;;
hppa2.0*-*-hpux*) arch=hppa; system=hpux;;
hppa*-*-linux*) arch=hppa; system=linux;;
@@ -683,8 +686,11 @@ case "$host" in
powerpc-*-rhapsody*) arch=power; model=ppc; system=rhapsody;;
powerpc-*-darwin*) arch=power; system=rhapsody
if $arch64; then model=ppc64; else model=ppc; fi;;
+ powerpc-*-openbsd*) arch=power; model=ppc; system=bsd;;
arm*-*-linux*) arch=arm; system=linux;;
arm*-*-gnu*) arch=arm; system=gnu;;
+ arm*-*-openbsd*) arch=arm; system=openbsd;;
+ zaurus*-*-openbsd*) arch=arm; system=openbsd;;
ia64-*-linux*) arch=ia64; system=linux;;
ia64-*-gnu*) arch=ia64; system=gnu;;
ia64-*-freebsd*) arch=ia64; system=freebsd;;
@@ -784,11 +790,15 @@ if test -n "$asppoption"; then aspp="$asppoption"; fi
cc_profile='-pg'
case "$arch,$model,$system" in
alpha,*,digital) profiling='prof';;
+ alpha,*,openbsd) profiling='prof';;
i386,*,linux_elf) profiling='prof';;
i386,*,gnu) profiling='prof';;
i386,*,bsd_elf) profiling='prof';;
amd64,*,macosx) profiling='prof';;
i386,*,macosx) profiling='prof';;
+ amd64,*,openbsd) profiling='prof';;
+ power,*,bsd) profiling='prof';;
+ sparc,*,bsd) profiling='prof';;
sparc,*,solaris)
profiling='prof'
case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;;
@@ -1570,11 +1580,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