Commit 33173fbe authored by Joerg Bruehe's avatar Joerg Bruehe

Fix Bug #54739

Accidental change in compile-time definitions for FreeBSD


Revert the accidental setting of "HAVE_BROKEN_REALPATH"
on current versions of FreeBSD,

do it for both autotools ("configure.in")
and cmake ("cmake/os/FreeBSD.cmake").
parent a96267c1
...@@ -20,4 +20,5 @@ ...@@ -20,4 +20,5 @@
# #Legacy option, maybe not needed anymore , taken as is from autotools build # #Legacy option, maybe not needed anymore , taken as is from autotools build
# ADD_DEFINITIONS(-DNET_RETRY_COUNT=1000000) # ADD_DEFINITIONS(-DNET_RETRY_COUNT=1000000)
ADD_DEFINITIONS(-DHAVE_BROKEN_REALPATH) # The below was used for really old versions of FreeBSD, roughly: before 5.1.9
# ADD_DEFINITIONS(-DHAVE_BROKEN_REALPATH)
...@@ -1301,9 +1301,7 @@ case $SYSTEM_TYPE in ...@@ -1301,9 +1301,7 @@ case $SYSTEM_TYPE in
if test "$OSVERSION" -gt "600000" if test "$OSVERSION" -gt "600000"
then then
# Post user-level threads, MYSQLD_NET_RETRY_COUNT is not needed any more # Post user-level threads, MYSQLD_NET_RETRY_COUNT is not needed any more
AC_MSG_WARN([Adding fix for broken realpath]) :
CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
CXXFLAGS="$CXXFLAGS -DHAVE_BROKEN_REALPATH"
elif test "$OSVERSION" -gt "480100" && \ elif test "$OSVERSION" -gt "480100" && \
test "$OSVERSION" -lt "500000" || \ test "$OSVERSION" -lt "500000" || \
test "$OSVERSION" -gt "500109" test "$OSVERSION" -gt "500109"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment