2004-06-22 14:14:44 -04:00
|
|
|
$OpenBSD: patch-configure,v 1.6 2004/06/22 18:14:44 avsm Exp $
|
|
|
|
|
--- configure.orig Thu Sep 25 02:17:13 2003
|
|
|
|
|
+++ configure Tue Jun 22 04:43:09 2004
|
2004-03-05 16:54:35 -05:00
|
|
|
@@ -537,6 +537,7 @@ case "$host" in
|
|
|
|
|
alpha*-*-freebsd*) arch=alpha; system=freebsd;;
|
|
|
|
|
alpha*-*-netbsd*) arch=alpha; system=netbsd;;
|
|
|
|
|
alpha*-*-openbsd*) arch=alpha; system=openbsd;;
|
|
|
|
|
+ amd64-*-openbsd*) arch=amd64; system=openbsd;;
|
|
|
|
|
sparc*-*-sunos4.*) arch=sparc; system=sunos;;
|
|
|
|
|
sparc*-*-solaris2.*) arch=sparc; system=solaris;;
|
|
|
|
|
sparc*-*-*bsd*) arch=sparc; system=bsd;;
|
|
|
|
|
@@ -555,6 +556,7 @@ case "$host" in
|
2002-09-12 13:02:47 -04:00
|
|
|
powerpc-*-aix*) arch=power; model=ppc; system=aix;;
|
|
|
|
|
powerpc-*-linux*) arch=power; model=ppc; system=elf;;
|
2003-12-31 12:05:28 -05:00
|
|
|
powerpc-*-netbsd*) arch=power; model=ppc; system=bsd;;
|
|
|
|
|
+ macppc-*-openbsd*) arch=power; model=ppc; system=bsd;;
|
2002-09-12 13:02:47 -04:00
|
|
|
powerpc-*-rhapsody*) arch=power; model=ppc; system=rhapsody;;
|
|
|
|
|
powerpc-*-darwin*) arch=power; model=ppc; system=rhapsody;;
|
|
|
|
|
arm*-*-linux*) arch=arm; system=linux;;
|
2004-06-22 14:14:44 -04:00
|
|
|
@@ -629,8 +631,12 @@ esac
|
2004-01-25 12:02:59 -05:00
|
|
|
cc_profile='-pg'
|
|
|
|
|
case "$arch,$model,$system" in
|
|
|
|
|
alpha,*,digital) profiling='prof';;
|
|
|
|
|
+ alpha,*,openbsd) profiling='prof';;
|
|
|
|
|
i386,*,linux_elf) profiling='prof';;
|
|
|
|
|
i386,*,bsd_elf) profiling='prof';;
|
2004-03-05 16:54:35 -05:00
|
|
|
+ amd64,*,openbsd) profiling='prof';;
|
2004-06-22 14:14:44 -04:00
|
|
|
+ power,*,bsd) profiling='prof';;
|
2004-01-25 12:02:59 -05:00
|
|
|
+ sparc,*,bsd) profiling='prof';;
|
|
|
|
|
sparc,*,solaris)
|
|
|
|
|
profiling='prof'
|
|
|
|
|
case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;;
|
2004-06-22 14:14:44 -04:00
|
|
|
@@ -654,8 +660,8 @@ if test "$arch" != "none"; then
|
2004-03-05 16:54:35 -05:00
|
|
|
echo "$d/objcopy does not support option --redefine-sym, discarded"
|
|
|
|
|
continue;
|
|
|
|
|
fi
|
|
|
|
|
- if test `$d/nm --version | grep -s -c 'GNU nm'` -eq 0; then
|
|
|
|
|
- echo "$d/nm is not from GNU binutils, discarded"
|
|
|
|
|
+ if test `$d/nm --version 2>&1|grep -E -s -c 'GNU nm|OpenBSD'` -eq 0; then
|
|
|
|
|
+ echo "$d/nm is not from GNU binutils or OpenBSD, discarded"
|
|
|
|
|
continue;
|
|
|
|
|
fi
|
|
|
|
|
binutils_objcopy="$d/objcopy"
|
2004-06-22 14:14:44 -04:00
|
|
|
@@ -1411,7 +1417,7 @@ fi
|
2002-08-25 16:44:40 -04:00
|
|
|
|
|
|
|
|
(
|
|
|
|
|
cd ../../camlp4/config
|
|
|
|
|
-EXE=$exe ./configure_batch -bindir "$bindir" -libdir "$libdir" -mandir "$mandir" -ocaml-top ../.. > /dev/null
|
|
|
|
|
+EXE=$exe ./configure_batch -prefix "$prefix" -ocaml-top ../.. > /dev/null
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
# Final twiddling of compiler options to work around known bugs
|
