d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable use of compiler atomic builtins. For APR, this is limited to

Browse Source 
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)
This commit is contained in:
Nathan Whitehorn 2013-10-04 18:27:02 +00:00
parent 29904f46d6
commit d25d7b7d6e
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.bin/Makefile
View File

@ -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>

2
usr.bin/svn/lib/libapr/apr_private.h
View File

@ -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 */

2
usr.bin/svn/svn_private_config.h
View File

@ -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 */