995bcbc512
From brad, with tweaks by me.
51 lines
1.8 KiB
Plaintext
51 lines
1.8 KiB
Plaintext
$OpenBSD: patch-configure,v 1.6 2012/02/28 12:28:29 dcoppa Exp $
|
|
--- configure.orig Fri Jan 27 13:36:39 2012
|
|
+++ configure Sun Jan 29 21:11:03 2012
|
|
@@ -1,4 +1,4 @@
|
|
-#!/bin/bash
|
|
+#!${BASH}
|
|
##
|
|
## configure
|
|
##
|
|
@@ -101,6 +101,7 @@ all_platforms="${all_platforms} ppc32-linux-gcc"
|
|
all_platforms="${all_platforms} ppc64-darwin8-gcc"
|
|
all_platforms="${all_platforms} ppc64-darwin9-gcc"
|
|
all_platforms="${all_platforms} ppc64-linux-gcc"
|
|
+all_platforms="${all_platforms} sparc-linux-gcc"
|
|
all_platforms="${all_platforms} sparc-solaris-gcc"
|
|
all_platforms="${all_platforms} x86-darwin8-gcc"
|
|
all_platforms="${all_platforms} x86-darwin8-icc"
|
|
@@ -136,19 +137,6 @@ for t in ${all_targets}; do
|
|
[ -f ${source_path}/${t}.mk ] && enable ${t}
|
|
done
|
|
|
|
-# check installed doxygen version
|
|
-doxy_version=$(doxygen --version 2>/dev/null)
|
|
-doxy_major=${doxy_version%%.*}
|
|
-if [ ${doxy_major:-0} -ge 1 ]; then
|
|
- doxy_version=${doxy_version#*.}
|
|
- doxy_minor=${doxy_version%%.*}
|
|
- doxy_patch=${doxy_version##*.}
|
|
-
|
|
- [ $doxy_major -gt 1 ] && enable doxygen
|
|
- [ $doxy_minor -gt 5 ] && enable doxygen
|
|
- [ $doxy_minor -eq 5 ] && [ $doxy_patch -ge 3 ] && enable doxygen
|
|
-fi
|
|
-
|
|
# install everything except the sources, by default. sources will have
|
|
# to be enabled when doing dist builds, since that's no longer a common
|
|
# case.
|
|
@@ -433,12 +421,6 @@ EOF
|
|
}
|
|
|
|
process_detect() {
|
|
- if enabled shared; then
|
|
- # Can only build shared libs on a subset of platforms. Doing this check
|
|
- # here rather than at option parse time because the target auto-detect
|
|
- # magic happens after the command line has been parsed.
|
|
- enabled linux || die "--enable-shared only supported on ELF for now"
|
|
- fi
|
|
if [ -z "$CC" ]; then
|
|
echo "Bypassing toolchain for environment detection."
|
|
enable external_build
|