diff options
| author | nwhitehorn <nwhitehorn@FreeBSD.org> | 2013-10-04 18:27:02 +0000 |
|---|---|---|
| committer | nwhitehorn <nwhitehorn@FreeBSD.org> | 2013-10-04 18:27:02 +0000 |
| commit | 91400d13adf6baa3d71054ef635ab718686c7c66 (patch) | |
| tree | a5844a5c7a29cd2bcb320e8eb4e2bd8b6ae466a1 /usr.bin | |
| parent | cb6017acba4af8a9507267d1e08f91f9bb452cd6 (diff) | |
| download | FreeBSD-src-91400d13adf6baa3d71054ef635ab718686c7c66.zip FreeBSD-src-91400d13adf6baa3d71054ef635ab718686c7c66.tar.gz | |
Disable use of compiler atomic builtins. For APR, this is limited to
architectures where they are known not to work. For SVN itself, use
the least common denominator and disable them across the board. This
allows svnlite to build and run on all FreeBSD architectures.
Approved by: re (gjb)
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/svn/lib/libapr/apr_private.h | 2 | ||||
| -rw-r--r-- | usr.bin/svn/svn_private_config.h | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 985c2df..92958ae 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -366,13 +366,9 @@ SUBDIR+= users SUBDIR+= who .endif -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64" || \ - ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "i386" || \ - (${MACHINE_ARCH} == "armv6" && ${COMPILER_TYPE} == "clang") .if ${MK_SVN} == "yes" || ${MK_SVNLITE} == "yes" SUBDIR+= svn .endif -.endif .include <bsd.arch.inc.mk> diff --git a/usr.bin/svn/lib/libapr/apr_private.h b/usr.bin/svn/lib/libapr/apr_private.h index fcbbbd3..492a4f1 100644 --- a/usr.bin/svn/lib/libapr/apr_private.h +++ b/usr.bin/svn/lib/libapr/apr_private.h @@ -97,7 +97,9 @@ #define HAVE_ARPA_INET_H 1 /* Define if compiler provides atomic builtins */ +#if !defined(__mips__) && !defined(__arm__) #define HAVE_ATOMIC_BUILTINS 1 +#endif /* Define if BONE_VERSION is defined in sys/socket.h */ /* #undef HAVE_BONE_VERSION */ diff --git a/usr.bin/svn/svn_private_config.h b/usr.bin/svn/svn_private_config.h index 00eb0fc..0611095 100644 --- a/usr.bin/svn/svn_private_config.h +++ b/usr.bin/svn/svn_private_config.h @@ -153,7 +153,7 @@ #define SVN_FS_WANT_DB_PATCH 14 /* Define if compiler provides atomic builtins */ -#define SVN_HAS_ATOMIC_BUILTINS 1 +#define SVN_HAS_ATOMIC_BUILTINS 0 /* Is GNOME Keyring support enabled? */ /* #undef SVN_HAVE_GNOME_KEYRING */ |
