ports/databases/mysql323-server/files/patch-configure
Alex Dupre c9989eb4c4 - Completely restructure the port to follow other mysql* ports
(too many improvements to be listed here)
- Correctly support PTHREAD_LIBS/CFLAGS
- Use USE_GNOME=lthack
- Propagate DB_DIR in package [1]
- Use my @FreeBSD.org email address
- Bump PORTREVISION

PR:		ports/24749 [1]
Submitted by:	Tom Pavel <pavel@networkphysics.com> [1]
Approved by:	nork (mentor/implicitly)
2004-01-17 12:47:02 +00:00

105 lines
3 KiB
Text

--- configure.orig Thu Sep 11 13:49:33 2003
+++ configure Sat Jan 17 00:49:23 2004
@@ -8999,7 +8999,7 @@
;;
esac
fi
-HOSTNAME=$ac_cv_path_HOSTNAME
+HOSTNAME="$ac_cv_path_HOSTNAME -s"
if test -n "$HOSTNAME"; then
echo "$as_me:$LINENO: result: $HOSTNAME" >&5
@@ -9188,43 +9188,7 @@
echo "${ECHO_T}no" >&6
fi
-echo "$as_me:$LINENO: checking \"how to check if pid exists\"" >&5
-echo $ECHO_N "checking \"how to check if pid exists\"... $ECHO_C" >&6
-PS=$ac_cv_path_PS
-# Linux style
-if $PS p $$ 2> /dev/null | grep $0 > /dev/null
-then
- FIND_PROC="$PS p \$\$PID | grep mysqld > /dev/null"
-# Solaris
-elif $PS -p $$ 2> /dev/null | grep $0 > /dev/null
-then
- FIND_PROC="$PS -p \$\$PID | grep mysqld > /dev/null"
-# BSD style
-elif $PS -uaxww 2> /dev/null | grep $0 > /dev/null
-then
FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
-# SysV style
-elif $PS -ef 2> /dev/null | grep $0 > /dev/null
-then
- FIND_PROC="$PS -ef | grep mysqld | grep \" \$\$PID \" > /dev/null"
-# Do anybody use this?
-elif $PS $$ 2> /dev/null | grep $0 > /dev/null
-then
- FIND_PROC="$PS \$\$PID | grep mysqld > /dev/null"
-else
- case $SYSTEM_TYPE in
- *darwin*)
- FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
- ;;
- *cygwin*)
- FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null"
- ;;
- *)
- { { echo "$as_me:$LINENO: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&5
-echo "$as_me: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&2;}
- { (exit 1); exit 1; }; }
- esac
-fi
echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
echo "${ECHO_T}\"$FIND_PROC\"" >&6
@@ -12509,8 +12473,16 @@
;;
*freebsd*)
echo "Adding fix for interrupted reads"
- CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
- CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
+ OSVERSION=`/sbin/sysctl -a | /usr/bin/grep osreldate | /usr/bin/awk '{ print $2 }'`
+ if test "$OSVERSION" -gt "480100" && \
+ test "$OSVERSION" -lt "500000" || \
+ test "$OSVERSION" -gt "500109"
+ then
+ CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000"
+ else
+ CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
+ CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
+ fi
;;
*netbsd*)
echo "Adding flag -Dunix"
@@ -13710,30 +13682,6 @@
#define HAVE_RESTARTABLE_SYSCALLS 1
_ACEOF
-fi
-
-
-# Build optimized or debug version ?
-# First check for gcc and g++
-if test "$ac_cv_c_compiler_gnu" = "yes"
-then
- DEBUG_CFLAGS="-g"
- DEBUG_OPTIMIZE_CC="-O"
- OPTIMIZE_CFLAGS="$MAX_C_OPTIMIZE"
-else
- DEBUG_CFLAGS="-g"
- DEBUG_OPTIMIZE_CC=""
- OPTIMIZE_CFLAGS="-O"
-fi
-if test "$ac_cv_prog_cxx_g" = "yes"
-then
- DEBUG_CXXFLAGS="-g"
- DEBUG_OPTIMIZE_CXX="-O"
- OPTIMIZE_CXXFLAGS="-O3"
-else
- DEBUG_CXXFLAGS="-g"
- DEBUG_OPTIMIZE_CXX=""
- OPTIMIZE_CXXFLAGS="-O"
fi