Module Name: src
Committed By: joerg
Date: Tue Apr 15 10:02:21 UTC 2014
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto: aes.inc crypto.inc
sha.inc
Log Message:
Append to CPPFLAGS.${src}, don't overwrite it.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/aes.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/sha.inc
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/crypto.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/aes.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/aes.inc:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/aes.inc:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/aes.inc:1.2 Tue Jul 5 10:42:54 2011
+++ src/crypto/external/bsd/openssl/lib/libcrypto/aes.inc Tue Apr 15 10:02:21 2014
@@ -1,4 +1,4 @@
-# $NetBSD: aes.inc,v 1.2 2011/07/05 10:42:54 spz Exp $
+# $NetBSD: aes.inc,v 1.3 2014/04/15 10:02:21 joerg Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -16,6 +16,6 @@ AES_SRCS += aes_misc.c aes_cfb.c aes_ofb
SRCS += ${AES_SRCS}
.for cryptosrc in ${AES_SRCS}
-CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/aes ${AESCPPFLAGS}
+CPPFLAGS.${cryptosrc} += -I${OPENSSLSRC}/crypto/aes ${AESCPPFLAGS}
.endfor
Index: src/crypto/external/bsd/openssl/lib/libcrypto/sha.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/sha.inc:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/sha.inc:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/sha.inc:1.2 Sun Mar 2 08:58:02 2014
+++ src/crypto/external/bsd/openssl/lib/libcrypto/sha.inc Tue Apr 15 10:02:21 2014
@@ -1,4 +1,4 @@
-# $NetBSD: sha.inc,v 1.2 2014/03/02 08:58:02 nakayama Exp $
+# $NetBSD: sha.inc,v 1.3 2014/04/15 10:02:21 joerg Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -16,5 +16,5 @@ SHA_SRCS+= libc-sha512.c libc-sha256.c
SRCS += ${SHA_SRCS}
.for cryptosrc in ${SHA_SRCS}
-CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/sha ${SHACPPFLAGS}
+CPPFLAGS.${cryptosrc} += -I${OPENSSLSRC}/crypto/sha ${SHACPPFLAGS}
.endfor
Index: src/crypto/external/bsd/openssl/lib/libcrypto/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/crypto.inc:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/crypto.inc:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/crypto.inc:1.3 Tue Jul 5 10:42:54 2011
+++ src/crypto/external/bsd/openssl/lib/libcrypto/crypto.inc Tue Apr 15 10:02:21 2014
@@ -1,4 +1,4 @@
-# $NetBSD: crypto.inc,v 1.3 2011/07/05 10:42:54 spz Exp $
+# $NetBSD: crypto.inc,v 1.4 2014/04/15 10:02:21 joerg Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -20,5 +20,5 @@ CRYPTOCPPFLAGS=-DOPENSSL_CPUID_OBJ
.endif
.for cryptosrc in ${CRYPTO_SRCS}
-CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/crypto ${CRYPTOCPPFLAGS}
+CPPFLAGS.${cryptosrc} += -I${OPENSSLSRC}/crypto/crypto ${CRYPTOCPPFLAGS}
.endfor
