Date: Thu, 4 Jun 2009 18:03:13 +0000 (UTC) From: Ed Schouten <ed@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r193446 - in projects/clangbsd: crypto/openssl/crypto/rc5 secure/lib/libcrypto Message-ID: <200906041803.n54I3DCG099513@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ed Date: Thu Jun 4 18:03:13 2009 New Revision: 193446 URL: http://svn.freebsd.org/changeset/base/193446 Log: Allow us to build libcrypto with Clang. Modified: projects/clangbsd/crypto/openssl/crypto/rc5/rc5.h projects/clangbsd/secure/lib/libcrypto/Makefile projects/clangbsd/secure/lib/libcrypto/Makefile.inc Modified: projects/clangbsd/crypto/openssl/crypto/rc5/rc5.h ============================================================================== --- projects/clangbsd/crypto/openssl/crypto/rc5/rc5.h Thu Jun 4 18:03:03 2009 (r193445) +++ projects/clangbsd/crypto/openssl/crypto/rc5/rc5.h Thu Jun 4 18:03:13 2009 (r193446) @@ -73,7 +73,11 @@ extern "C" { #define RC5_DECRYPT 0 /* 32 bit. For Alpha, things may get weird */ +#ifdef __amd64__ +#define RC5_32_INT unsigned int +#else #define RC5_32_INT unsigned long +#endif #define RC5_32_BLOCK 8 #define RC5_32_KEY_LENGTH 16 /* This is a default, max is 255 */ Modified: projects/clangbsd/secure/lib/libcrypto/Makefile ============================================================================== --- projects/clangbsd/secure/lib/libcrypto/Makefile Thu Jun 4 18:03:03 2009 (r193445) +++ projects/clangbsd/secure/lib/libcrypto/Makefile Thu Jun 4 18:03:13 2009 (r193446) @@ -3,12 +3,11 @@ SHLIBDIR?= /lib SUBDIR= engines +.include <bsd.own.mk> + LIB= crypto SHLIB_MAJOR= 5 -# XXX: LLVM PR3678 -CFLAGS+= -DOPENSSL_NO_INLINE_ASM - NO_LINT= .if exists(Makefile.man) Modified: projects/clangbsd/secure/lib/libcrypto/Makefile.inc ============================================================================== --- projects/clangbsd/secure/lib/libcrypto/Makefile.inc Thu Jun 4 18:03:03 2009 (r193445) +++ projects/clangbsd/secure/lib/libcrypto/Makefile.inc Thu Jun 4 18:03:13 2009 (r193446) @@ -14,7 +14,7 @@ CFLAGS+= -DOPENSSL_NO_IDEA .endif .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" -CFLAGS+= -DL_ENDIAN +CFLAGS+= -DL_ENDIAN -DMD32_REG_T=int .endif MANDIR= ${SHAREDIR}/openssl/man/man
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906041803.n54I3DCG099513>