mirror of
https://github.com/MariaDB/server.git
synced 2025-09-03 20:43:11 +03:00
Added testing of glibc compiled with static nss (as on the MySQL build machine)
This commit is contained in:
21
configure.in
21
configure.in
@@ -453,6 +453,7 @@ fi
|
|||||||
|
|
||||||
NOINST_LDFLAGS=
|
NOINST_LDFLAGS=
|
||||||
|
|
||||||
|
static_nss=""
|
||||||
AC_ARG_WITH(other-libc,
|
AC_ARG_WITH(other-libc,
|
||||||
[ --with-other-libc=DIR Link against libc and other standard libraries
|
[ --with-other-libc=DIR Link against libc and other standard libraries
|
||||||
installed in the specified non-standard location
|
installed in the specified non-standard location
|
||||||
@@ -472,7 +473,6 @@ AC_ARG_WITH(other-libc,
|
|||||||
# by telling it to be permissive. Note that this option only works with
|
# by telling it to be permissive. Note that this option only works with
|
||||||
# new versions of gcc (2.95.x and above)
|
# new versions of gcc (2.95.x and above)
|
||||||
CXXFLAGS="$CXXFLAGS -fpermissive -I$other_libc_include"
|
CXXFLAGS="$CXXFLAGS -fpermissive -I$other_libc_include"
|
||||||
static_nss=
|
|
||||||
if test -f "$other_libc_lib/libnss_files.a"
|
if test -f "$other_libc_lib/libnss_files.a"
|
||||||
then
|
then
|
||||||
# libc has been compiled with --enable-static-nss
|
# libc has been compiled with --enable-static-nss
|
||||||
@@ -507,6 +507,23 @@ AC_ARG_WITH(other-libc,
|
|||||||
)
|
)
|
||||||
AC_SUBST(NOINST_LDFLAGS)
|
AC_SUBST(NOINST_LDFLAGS)
|
||||||
|
|
||||||
|
#
|
||||||
|
# Check if we are using Linux and a glibc compiled with static nss
|
||||||
|
# (this is true on the MySQL build machines to avoid NSS problems)
|
||||||
|
#
|
||||||
|
|
||||||
|
if test "$IS_LINUX" = "true" -a "$static_nss" = ""
|
||||||
|
then
|
||||||
|
tmp=`nm /usr/lib/libc.a | grep _nss_files_getaliasent_r`
|
||||||
|
if test -n "$tmp"
|
||||||
|
then
|
||||||
|
STATIC_NSS_FLAGS="-Wl,--start-group -lc -lnss_files -lnss_dns -lresolv \
|
||||||
|
-Wl,--end-group"
|
||||||
|
static_nss=1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
AC_ARG_WITH(server-suffix,
|
AC_ARG_WITH(server-suffix,
|
||||||
[ --with-server-suffix Append value to the version string.],
|
[ --with-server-suffix Append value to the version string.],
|
||||||
[ MYSQL_SERVER_SUFFIX=`echo "$withval" | sed -e 's/^\(...................................\)..*$/\1/'` ],
|
[ MYSQL_SERVER_SUFFIX=`echo "$withval" | sed -e 's/^\(...................................\)..*$/\1/'` ],
|
||||||
@@ -1392,7 +1409,7 @@ else
|
|||||||
CXXFLAGS="$OPTIMIZE_CXXFLAGS -DDBUG_OFF $CXXFLAGS"
|
CXXFLAGS="$OPTIMIZE_CXXFLAGS -DDBUG_OFF $CXXFLAGS"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Force static compilation to avoid linking probles/get more speed
|
# Force static compilation to avoid linking problems/get more speed
|
||||||
AC_ARG_WITH(mysqld-ldflags,
|
AC_ARG_WITH(mysqld-ldflags,
|
||||||
[ --with-mysqld-ldflags Extra linking arguments for mysqld],
|
[ --with-mysqld-ldflags Extra linking arguments for mysqld],
|
||||||
[MYSQLD_EXTRA_LDFLAGS=$withval],
|
[MYSQLD_EXTRA_LDFLAGS=$withval],
|
||||||
|
Reference in New Issue
Block a user