File: [cvs.NetBSD.org] / pkgsrc / databases / db6 / patches / patch-dist_configure (download)
Revision 1.3, Fri Aug 26 12:31:34 2016 UTC (7 years, 7 months ago) by richard
Branch: MAIN
CVS Tags: pkgsrc-2016Q4-base, pkgsrc-2016Q4, pkgsrc-2016Q3-base, pkgsrc-2016Q3 Changes since 1.2: +24 -13
lines
redo patch update for __aarch64__ as the real problem is that only __arm64__
was being checked and not the gcc toolchain's use of __aarch64__.
db6 does support the 64-bit ARM platform.
previous condition put back as it was prior.
ride PKGREVISION bump
|
$NetBSD: patch-dist_configure,v 1.3 2016/08/26 12:31:34 richard Exp $
toolchains differ whether __aarch64__ or __arm64__ should be defined.
--- dist/configure.orig 2015-06-18 20:04:54.000000000 +0000
+++ dist/configure
@@ -5235,7 +5235,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*)
@@ -7029,7 +7029,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
@@ -12351,7 +12351,7 @@ fi
hardcode_shlibpath_var=no
;;
- freebsd1*)
+ freebsd1*|freebsd1.*)
ld_shlibs=no
;;
@@ -13345,7 +13345,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
-freebsd1*)
+freebsd1*|freebsd1.*)
dynamic_linker=no
;;
@@ -13356,7 +13356,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[123]*|freebsd[123].*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
@@ -15314,7 +15314,7 @@ fi
esac
;;
- freebsd[12]*)
+ freebsd[12]*|freebsd[12].*)
# C++ shared libraries reported to be fairly broken before
# switch to ELF
ld_shlibs_CXX=no
@@ -17178,7 +17178,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
-freebsd1*)
+freebsd1*|freebsd1.*)
dynamic_linker=no
;;
@@ -17189,7 +17189,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[123]*|freebsd[123].*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
@@ -17836,7 +17836,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"
@@ -18569,7 +18569,7 @@ if test "$_JTOPDIR" != "/usr"; then
aix*) _JNI_INC_SUBDIRS="aix";;
bsdi*) _JNI_INC_SUBDIRS="bsdos";;
cygwin*) _JNI_INC_SUBDIRS="win32";;
- freebsd*) _JNI_INC_SUBDIRS="freebsd";;
+ freebsd*|dragonfly*) _JNI_INC_SUBDIRS="freebsd";;
hp*) _JNI_INC_SUBDIRS="hp-ux";;
linux*) _JNI_INC_SUBDIRS="linux genunix";;
osf*) _JNI_INC_SUBDIRS="alpha";;
@@ -20753,7 +20753,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 :
@@ -21993,7 +21993,7 @@ int
main ()
{
-#if defined(__arm64__) && defined(__GNUC__)
+#if (defined(__arm64__) || defined(__aarch64__)) && defined(__GNUC__)
return (0);
#else
FAIL TO COMPILE/LINK