mirror of
https://github.com/MariaDB/server.git
synced 2026-05-10 00:54:30 +02:00
- applied fix from 4.0 configure.in required to build shared libraries
with static glibc installed
configure.in:
- Better fix for building shared libraries with a patched glibc
(from 4.0 tree)
- removed obsolete comment
This commit is contained in:
parent
a829c4c0cb
commit
421514ae81
1 changed files with 4 additions and 11 deletions
15
configure.in
15
configure.in
|
|
@ -481,7 +481,7 @@ AC_ARG_WITH(other-libc,
|
|||
# we need special flags, but we will have to add those later
|
||||
STATIC_NSS_FLAGS="-lc -lnss_files -lnss_dns -lresolv"
|
||||
STATIC_NSS_FLAGS="$STATIC_NSS_FLAGS $STATIC_NSS_FLAGS"
|
||||
OTHER_LIBC_LIB="-L$other_libc_lib"
|
||||
OTHER_LIBC_LIB="-static -L$other_libc_lib"
|
||||
static_nss=1
|
||||
else
|
||||
# this is a dirty hack. We if we detect static nss glibc in the special
|
||||
|
|
@ -529,7 +529,6 @@ fi
|
|||
|
||||
AC_ARG_WITH(server-suffix,
|
||||
[ --with-server-suffix Append value to the version string.],
|
||||
# I heard that 'cut' isn't portable. Isn't there a better way?
|
||||
[ MYSQL_SERVER_SUFFIX=`echo "$withval" | sed -e 's/^\(...................................\)..*$/\1/'` ],
|
||||
[ MYSQL_SERVER_SUFFIX= ]
|
||||
)
|
||||
|
|
@ -2122,10 +2121,7 @@ then
|
|||
AC_DEFINE(THREAD_SAFE_CLIENT)
|
||||
fi
|
||||
|
||||
if test "$static_nss" = "1"
|
||||
then
|
||||
CLIENT_LIBS="$CLIENT_LIBS $STATIC_NSS_FLAGS"
|
||||
fi
|
||||
CLIENT_LIBS="$CLIENT_LIBS $STATIC_NSS_FLAGS"
|
||||
|
||||
AC_SUBST(CLIENT_LIBS)
|
||||
AC_SUBST(sql_client_dirs)
|
||||
|
|
@ -2275,11 +2271,8 @@ fi
|
|||
# I know to add the static NSS magic if we have static NSS libraries with
|
||||
# glibc - Sasha
|
||||
|
||||
if test "$static_nss" = "1"
|
||||
then
|
||||
LDFLAGS="$LDFLAGS -static $OTHER_LIBC_LIB"
|
||||
LIBS="$LIBS $STATIC_NSS_FLAGS"
|
||||
fi
|
||||
LDFLAGS="$LDFLAGS $OTHER_LIBC_LIB"
|
||||
LIBS="$LIBS $STATIC_NSS_FLAGS"
|
||||
|
||||
AC_SUBST(sql_server_dirs)
|
||||
AC_SUBST(thread_dirs)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue