mirror of
https://gitlab.isc.org/isc-projects/bind9
synced 2025-08-29 13:38:26 +00:00
2645. [port] "gcc -m32" didn't work on amd64 and x86_64 platforms
which default to 64 bits. [RT #19927]
This commit is contained in:
Mark Andrews
parent
835ee9481b
commit
90c1e763d5
3
CHANGES
3
CHANGES
@ -1,3 +1,6 @@
|
||||
2645. [port] "gcc -m32" didn't work on amd64 and x86_64 platforms
|
||||
which default to 64 bits. [RT #19927]
|
||||
|
||||
--- 9.7.0a2 released ---
|
||||
|
||||
2644. [bug] Change #2628 caused a regression on some systems;
|
||||
|
||||
104
configure
vendored
104
configure
vendored
@ -14,7 +14,7 @@
|
||||
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||
# PERFORMANCE OF THIS SOFTWARE.
|
||||
#
|
||||
# $Id: configure,v 1.458 2009/07/14 22:39:30 each Exp $
|
||||
# $Id: configure,v 1.459 2009/08/13 01:51:19 marka Exp $
|
||||
#
|
||||
# Portions Copyright (C) 1996-2001 Nominum, Inc.
|
||||
#
|
||||
@ -29,7 +29,7 @@
|
||||
# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
|
||||
# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
# From configure.in Revision: 1.472 .
|
||||
# From configure.in Revision: 1.473 .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61.
|
||||
#
|
||||
@ -1642,15 +1642,15 @@ Optional Features:
|
||||
--enable-openssl-hash use OpenSSL for hash functions [default=no]
|
||||
--enable-threads enable multithreading
|
||||
--enable-largefile 64-bit file support
|
||||
--enable-ipv6 use IPv6 default=autodetect
|
||||
--enable-getifaddrs Enable the use of getifaddrs() [yes|no].
|
||||
--disable-isc-spnego use SPNEGO from GSSAPI library
|
||||
--disable-chroot disable chroot
|
||||
--disable-linux-caps disable linux capabilities
|
||||
--enable-atomic enable machine specific atomic operations
|
||||
[default=autodetect]
|
||||
--enable-fixed-rrset enable fixed rrset ordering
|
||||
[default=no]
|
||||
--enable-ipv6 use IPv6 default=autodetect
|
||||
--enable-getifaddrs Enable the use of getifaddrs() [yes|no].
|
||||
--disable-isc-spnego use SPNEGO from GSSAPI library
|
||||
--disable-chroot disable chroot
|
||||
--disable-linux-caps disable linux capabilities
|
||||
--enable-atomic enable machine specific atomic operations
|
||||
[default=autodetect]
|
||||
--enable-fixed-rrset enable fixed rrset ordering
|
||||
[default=no]
|
||||
|
||||
Optional Packages:
|
||||
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
|
||||
@ -1659,21 +1659,21 @@ Optional Packages:
|
||||
--with-pic try to use only PIC/non-PIC objects [default=use
|
||||
both]
|
||||
--with-tags[=TAGS] include additional configurations [automatic]
|
||||
--with-openssl=PATH Build with OpenSSL yes|no|path.
|
||||
--with-openssl=PATH Build with OpenSSL yes|no|path.
|
||||
(Required for DNSSEC)
|
||||
--with-pkcs11 Build with PKCS11 support
|
||||
--with-gssapi=PATH Specify path for system-supplied GSSAPI
|
||||
--with-randomdev=PATH Specify path for random device
|
||||
--with-pkcs11 Build with PKCS11 support
|
||||
--with-gssapi=PATH Specify path for system-supplied GSSAPI
|
||||
--with-randomdev=PATH Specify path for random device
|
||||
--with-ptl2 on NetBSD, use the ptl2 thread library (experimental)
|
||||
--with-libxml2=PATH Build with libxml2 library yes|no|path
|
||||
--with-purify=PATH use Rational purify
|
||||
--with-libtool use GNU libtool (following indented options supported)
|
||||
--with-kame=PATH use Kame IPv6 default path /usr/local/v6
|
||||
--with-docbook-xsl=PATH Specify path for Docbook-XSL stylesheets
|
||||
--with-idn=MPREFIX enable IDN support using idnkit default PREFIX
|
||||
--with-libiconv=IPREFIX GNU libiconv are in IPREFIX default PREFIX
|
||||
--with-iconv=LIBSPEC specify iconv library default -liconv
|
||||
--with-idnlib=ARG specify libidnkit
|
||||
--with-libxml2=PATH Build with libxml2 library yes|no|path
|
||||
--with-purify=PATH use Rational purify
|
||||
--with-libtool use GNU libtool
|
||||
--with-kame=PATH use Kame IPv6 default path /usr/local/v6
|
||||
--with-docbook-xsl=PATH Specify path for Docbook-XSL stylesheets
|
||||
--with-idn=MPREFIX enable IDN support using idnkit default PREFIX
|
||||
--with-libiconv=IPREFIX GNU libiconv are in IPREFIX default PREFIX
|
||||
--with-iconv=LIBSPEC specify iconv library default -liconv
|
||||
--with-idnlib=ARG specify libidnkit
|
||||
--with-dlz-postgres=PATH Build with Postgres DLZ driver yes|no|path.
|
||||
(Required to use Postgres with DLZ)
|
||||
--with-dlz-mysql=PATH Build with MySQL DLZ driver yes|no|path.
|
||||
@ -30630,8 +30630,56 @@ fi
|
||||
|
||||
;;
|
||||
x86_64-*|amd64-*)
|
||||
have_xaddq=yes
|
||||
arch=x86_64
|
||||
if test "$cross_compiling" = yes; then
|
||||
arch=x86_64
|
||||
have_xaddq=yes
|
||||
else
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
main() {
|
||||
exit((sizeof(void *) == 8) ? 0 : 1);
|
||||
}
|
||||
|
||||
_ACEOF
|
||||
rm -f conftest$ac_exeext
|
||||
if { (ac_try="$ac_link"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||
(eval "$ac_link") 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
|
||||
{ (case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||
(eval "$ac_try") 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
arch=x86_64
|
||||
have_xaddq=yes
|
||||
else
|
||||
echo "$as_me: program exited with status $ac_status" >&5
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
( exit $ac_status )
|
||||
arch=x86_32
|
||||
fi
|
||||
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
|
||||
|
||||
;;
|
||||
alpha*-*)
|
||||
arch=alpha
|
||||
@ -30861,9 +30909,9 @@ else
|
||||
fi
|
||||
|
||||
if test "$have_xaddq" = "yes"; then
|
||||
ISC_PLATFORM_HAVEXADDQ="#define ISC_PLATFORM_HAVEXADDQ 1"
|
||||
ISC_PLATFORM_HAVEXADDQ="#define ISC_PLATFORM_HAVEXADDQ 1"
|
||||
else
|
||||
ISC_PLATFORM_HAVEXADDQ="#undef ISC_PLATFORM_HAVEXADDQ"
|
||||
ISC_PLATFORM_HAVEXADDQ="#undef ISC_PLATFORM_HAVEXADDQ"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
64
configure.in
64
configure.in
@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl
|
||||
esyscmd([sed "s/^/# /" COPYRIGHT])dnl
|
||||
AC_DIVERT_POP()dnl
|
||||
|
||||
AC_REVISION($Revision: 1.472 $)
|
||||
AC_REVISION($Revision: 1.473 $)
|
||||
|
||||
AC_INIT(lib/dns/name.c)
|
||||
AC_PREREQ(2.59)
|
||||
@ -485,7 +485,7 @@ AC_C_BIGENDIAN
|
||||
OPENSSL_WARNING=
|
||||
AC_MSG_CHECKING(for OpenSSL library)
|
||||
AC_ARG_WITH(openssl,
|
||||
[ --with-openssl[=PATH] Build with OpenSSL [yes|no|path].
|
||||
[ --with-openssl[=PATH] Build with OpenSSL [yes|no|path].
|
||||
(Required for DNSSEC)],
|
||||
use_openssl="$withval", use_openssl="auto")
|
||||
|
||||
@ -695,7 +695,7 @@ AC_SUBST(ISC_OPENSSL_INC)
|
||||
|
||||
AC_MSG_CHECKING(for PKCS11 support)
|
||||
AC_ARG_WITH(pkcs11,
|
||||
[ --with-pkcs11 Build with PKCS11 support],
|
||||
[ --with-pkcs11 Build with PKCS11 support],
|
||||
use_pkcs11="yes", use_pkcs11="no")
|
||||
|
||||
case "$use_pkcs11" in
|
||||
@ -713,7 +713,7 @@ AC_SUBST(USE_PKCS11)
|
||||
|
||||
AC_MSG_CHECKING(for GSSAPI library)
|
||||
AC_ARG_WITH(gssapi,
|
||||
[ --with-gssapi=PATH Specify path for system-supplied GSSAPI],
|
||||
[ --with-gssapi=PATH Specify path for system-supplied GSSAPI],
|
||||
use_gssapi="$withval", use_gssapi="no")
|
||||
|
||||
gssapidirs="/usr/local /usr/pkg /usr/kerberos /usr"
|
||||
@ -867,7 +867,7 @@ AC_SUBST(DNS_CRYPTO_LIBS)
|
||||
#
|
||||
AC_MSG_CHECKING(for random device)
|
||||
AC_ARG_WITH(randomdev,
|
||||
[ --with-randomdev=PATH Specify path for random device],
|
||||
[ --with-randomdev=PATH Specify path for random device],
|
||||
use_randomdev="$withval", use_randomdev="unspec")
|
||||
|
||||
case "$use_randomdev" in
|
||||
@ -1040,7 +1040,7 @@ AC_SUBST(ISC_THREAD_DIR)
|
||||
#
|
||||
AC_MSG_CHECKING(for libxml2 library)
|
||||
AC_ARG_WITH(libxml2,
|
||||
[ --with-libxml2[=PATH] Build with libxml2 library [yes|no|path]],
|
||||
[ --with-libxml2[=PATH] Build with libxml2 library [yes|no|path]],
|
||||
use_libxml2="$withval", use_libxml2="auto")
|
||||
|
||||
case "$use_libxml2" in
|
||||
@ -1234,7 +1234,7 @@ esac
|
||||
#
|
||||
AC_MSG_CHECKING(whether to use purify)
|
||||
AC_ARG_WITH(purify,
|
||||
[ --with-purify[=PATH] use Rational purify],
|
||||
[ --with-purify[=PATH] use Rational purify],
|
||||
use_purify="$withval", use_purify="no")
|
||||
|
||||
case "$use_purify" in
|
||||
@ -1273,7 +1273,7 @@ AC_SUBST(PURIFY)
|
||||
|
||||
|
||||
AC_ARG_WITH(libtool,
|
||||
[ --with-libtool use GNU libtool (following indented options supported)],
|
||||
[ --with-libtool use GNU libtool],
|
||||
use_libtool="$withval", use_libtool="no")
|
||||
|
||||
case $use_libtool in
|
||||
@ -1332,7 +1332,7 @@ AC_SUBST(LIBTOOL_IN_MAIN)
|
||||
# IPv6
|
||||
#
|
||||
AC_ARG_ENABLE(ipv6,
|
||||
[ --enable-ipv6 use IPv6 [default=autodetect]])
|
||||
[ --enable-ipv6 use IPv6 [default=autodetect]])
|
||||
|
||||
case "$enable_ipv6" in
|
||||
yes|''|autodetect)
|
||||
@ -1363,7 +1363,7 @@ AC_TRY_COMPILE([
|
||||
#
|
||||
AC_MSG_CHECKING(for Kame IPv6 support)
|
||||
AC_ARG_WITH(kame,
|
||||
[ --with-kame[=PATH] use Kame IPv6 [default path /usr/local/v6]],
|
||||
[ --with-kame[=PATH] use Kame IPv6 [default path /usr/local/v6]],
|
||||
use_kame="$withval", use_kame="no")
|
||||
|
||||
case "$use_kame" in
|
||||
@ -1813,7 +1813,7 @@ AC_SUBST(ISC_LWRES_GETADDRINFOPROTO)
|
||||
AC_SUBST(ISC_LWRES_GETNAMEINFOPROTO)
|
||||
|
||||
AC_ARG_ENABLE(getifaddrs,
|
||||
[ --enable-getifaddrs Enable the use of getifaddrs() [[yes|no]].],
|
||||
[ --enable-getifaddrs Enable the use of getifaddrs() [[yes|no]].],
|
||||
want_getifaddrs="$enableval", want_getifaddrs="yes")
|
||||
|
||||
#
|
||||
@ -1935,7 +1935,7 @@ AC_SUBST(ISC_EXTRA_SRCS)
|
||||
# Use our own SPNEGO implementation?
|
||||
#
|
||||
AC_ARG_ENABLE(isc-spnego,
|
||||
[ --disable-isc-spnego use SPNEGO from GSSAPI library])
|
||||
[ --disable-isc-spnego use SPNEGO from GSSAPI library])
|
||||
|
||||
if test -n "$USE_GSSAPI"
|
||||
then
|
||||
@ -2000,7 +2000,7 @@ AC_SUBST(LWRES_PLATFORM_QUADFORMAT)
|
||||
# Note it is very recommended to *not* disable chroot(),
|
||||
# this is only because chroot() was made obsolete by Posix.
|
||||
AC_ARG_ENABLE(chroot,
|
||||
[ --disable-chroot disable chroot])
|
||||
[ --disable-chroot disable chroot])
|
||||
case "$enable_chroot" in
|
||||
yes|'')
|
||||
AC_CHECK_FUNCS(chroot)
|
||||
@ -2009,7 +2009,7 @@ case "$enable_chroot" in
|
||||
;;
|
||||
esac
|
||||
AC_ARG_ENABLE(linux-caps,
|
||||
[ --disable-linux-caps disable linux capabilities])
|
||||
[ --disable-linux-caps disable linux capabilities])
|
||||
case "$enable_linux_caps" in
|
||||
yes|'')
|
||||
AC_CHECK_HEADERS(linux/capability.h sys/capability.h)
|
||||
@ -2248,8 +2248,8 @@ AC_CHECK_FUNCS(nanosleep)
|
||||
# Machine architecture dependent features
|
||||
#
|
||||
AC_ARG_ENABLE(atomic,
|
||||
[ --enable-atomic enable machine specific atomic operations
|
||||
[[default=autodetect]]],
|
||||
[ --enable-atomic enable machine specific atomic operations
|
||||
[[default=autodetect]]],
|
||||
enable_atomic="$enableval",
|
||||
enable_atomic="autodetect")
|
||||
case "$enable_atomic" in
|
||||
@ -2281,8 +2281,16 @@ main() {
|
||||
[arch=x86_32])
|
||||
;;
|
||||
x86_64-*|amd64-*)
|
||||
have_xaddq=yes
|
||||
arch=x86_64
|
||||
AC_TRY_RUN([
|
||||
main() {
|
||||
exit((sizeof(void *) == 8) ? 0 : 1);
|
||||
}
|
||||
],
|
||||
[arch=x86_64
|
||||
have_xaddq=yes],
|
||||
[arch=x86_32],
|
||||
[arch=x86_64
|
||||
have_xaddq=yes])
|
||||
;;
|
||||
alpha*-*)
|
||||
arch=alpha
|
||||
@ -2387,9 +2395,9 @@ else
|
||||
fi
|
||||
|
||||
if test "$have_xaddq" = "yes"; then
|
||||
ISC_PLATFORM_HAVEXADDQ="#define ISC_PLATFORM_HAVEXADDQ 1"
|
||||
ISC_PLATFORM_HAVEXADDQ="#define ISC_PLATFORM_HAVEXADDQ 1"
|
||||
else
|
||||
ISC_PLATFORM_HAVEXADDQ="#undef ISC_PLATFORM_HAVEXADDQ"
|
||||
ISC_PLATFORM_HAVEXADDQ="#undef ISC_PLATFORM_HAVEXADDQ"
|
||||
fi
|
||||
|
||||
AC_SUBST(ISC_PLATFORM_HAVEXADD)
|
||||
@ -2409,14 +2417,14 @@ AC_SUBST(ISC_ARCH_DIR)
|
||||
# Activate "rrset-order fixed" or not?
|
||||
#
|
||||
AC_ARG_ENABLE(fixed-rrset,
|
||||
[ --enable-fixed-rrset enable fixed rrset ordering
|
||||
[[default=no]]],
|
||||
[ --enable-fixed-rrset enable fixed rrset ordering
|
||||
[[default=no]]],
|
||||
enable_fixed="$enableval",
|
||||
enable_fixed="no")
|
||||
case "$enable_fixed" in
|
||||
yes)
|
||||
AC_DEFINE(DNS_RDATASET_FIXED, 1,
|
||||
[Define to enable "rrset-order fixed" syntax.])
|
||||
[Define to enable "rrset-order fixed" syntax.])
|
||||
;;
|
||||
no)
|
||||
;;
|
||||
@ -2536,7 +2544,7 @@ AC_SUBST($1)
|
||||
#
|
||||
AC_MSG_CHECKING(for Docbook-XSL path)
|
||||
AC_ARG_WITH(docbook-xsl,
|
||||
[ --with-docbook-xsl=PATH Specify path for Docbook-XSL stylesheets],
|
||||
[ --with-docbook-xsl=PATH Specify path for Docbook-XSL stylesheets],
|
||||
docbook_path="$withval", docbook_path="auto")
|
||||
case "$docbook_path" in
|
||||
auto)
|
||||
@ -2604,7 +2612,7 @@ AC_SUBST(XSLT_DB2LATEX_ADMONITIONS)
|
||||
# IDN support
|
||||
#
|
||||
AC_ARG_WITH(idn,
|
||||
[ --with-idn[=MPREFIX] enable IDN support using idnkit [default PREFIX]],
|
||||
[ --with-idn[=MPREFIX] enable IDN support using idnkit [default PREFIX]],
|
||||
use_idn="$withval", use_idn="no")
|
||||
case "$use_idn" in
|
||||
yes)
|
||||
@ -2624,7 +2632,7 @@ esac
|
||||
iconvinc=
|
||||
iconvlib=
|
||||
AC_ARG_WITH(libiconv,
|
||||
[ --with-libiconv[=IPREFIX] GNU libiconv are in IPREFIX [default PREFIX]],
|
||||
[ --with-libiconv[=IPREFIX] GNU libiconv are in IPREFIX [default PREFIX]],
|
||||
use_libiconv="$withval", use_libiconv="no")
|
||||
case "$use_libiconv" in
|
||||
yes)
|
||||
@ -2643,7 +2651,7 @@ no)
|
||||
esac
|
||||
|
||||
AC_ARG_WITH(iconv,
|
||||
[ --with-iconv[=LIBSPEC] specify iconv library [default -liconv]],
|
||||
[ --with-iconv[=LIBSPEC] specify iconv library [default -liconv]],
|
||||
iconvlib="$withval")
|
||||
case "$iconvlib" in
|
||||
no)
|
||||
@ -2655,7 +2663,7 @@ yes)
|
||||
esac
|
||||
|
||||
AC_ARG_WITH(idnlib,
|
||||
[ --with-idnlib=ARG specify libidnkit],
|
||||
[ --with-idnlib=ARG specify libidnkit],
|
||||
idnlib="$withval", idnlib="no")
|
||||
if test "$idnlib" = yes; then
|
||||
AC_MSG_ERROR([You must specify ARG for --with-idnlib.])
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user