$NetBSD: patch-dist_configure,v 1.5 2020/06/29 13:24:55 ryoon Exp $ Toolchains differ whether __aarch64__ or __arm64__ should be defined. Portability fix. --- dist/configure.orig 2017-04-13 14:06:13.000000000 +0000 +++ dist/configure @@ -5276,7 +5276,7 @@ bsdi3*) CC=${CC-"shlicc2"} LIBSO_LIBS="$LIBSO_LIBS -lipc";; cygwin*) CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -D_REENTRANT";; -freebsd*) +freebsd*|dragonfly*) CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" LDFLAGS="$LDFLAGS -pthread";; gnu*|k*bsd*-gnu|linux*) @@ -7070,7 +7070,7 @@ fi # we're using. case "$host_os" in sysv5UnixWare*|sysv5OpenUNIX8*) - if test "$GCC" == "yes"; then + if test "$GCC" = "yes"; then CPPFLAGS="$CPPFLAGS -pthread" LDFLAGS="$LDFLAGS -pthread" else @@ -17877,7 +17877,7 @@ LIBTOOL="./libtool" INSTALLER="\$(LIBTOOL) --mode=install cp -p" MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}" -MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version" +MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}" MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}" MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}" MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version" @@ -18617,6 +18617,7 @@ if test "$_JTOPDIR" != "/usr"; then bsdi*) _JNI_INC_SUBDIRS="bsdos";; cygwin*) _JNI_INC_SUBDIRS="win32";; darwin*) _JNI_INC_SUBDIRS="darwin";; + dragonfly*) _JNI_INC_SUBDIRS="freebsd";; freebsd*) _JNI_INC_SUBDIRS="freebsd";; hp*) _JNI_INC_SUBDIRS="hp-ux";; linux*) _JNI_INC_SUBDIRS="linux genunix";; @@ -20485,7 +20486,7 @@ else fi -if test "$ac_cv_sizeof_off_t" == "4"; then +if test "$ac_cv_sizeof_off_t" = "4"; then db_off_t_max_decl="#define DB_OFF_T_MAX INT32_MAX" else db_off_t_max_decl="#define DB_OFF_T_MAX INT64_MAX" @@ -20820,7 +20821,7 @@ if test "$db_cv_mutex" = no; then # avoid these probes for multiprocess pthreads. ;; *) - if test "$db_cv_mutex" = no -o "$db_cv_mutex" = posix_only; then + if test "$ac_cv_lib_pthread_main" = yes -a "$db_cv_mutex" = no -o "$db_cv_mutex" = posix_only; then LIBS="$LIBS -lpthread" if test "$cross_compiling" = yes; then : @@ -22087,7 +22088,7 @@ int main () { -#if defined(__arm64__) && defined(__GNUC__) +#if (defined(__arm64__) || defined(__aarch64__)) && defined(__GNUC__) return (0); #else FAIL TO COMPILE/LINK