diff options
author | espie <> | 2017-08-20 17:53:13 +0000 |
---|---|---|
committer | espie <> | 2017-08-20 17:53:13 +0000 |
commit | a19ae3196438c4679417520077f63a6a2e0adad4 (patch) | |
tree | efaf3f3299eea6e7173cd2676e57b013b15582ce /src/lib/libcrypto/arch/amd64 | |
parent | 3f3b8a801b16a1c8a2232c7a6da38533a4e8b342 (diff) | |
download | openbsd-a19ae3196438c4679417520077f63a6a2e0adad4.tar.gz openbsd-a19ae3196438c4679417520077f63a6a2e0adad4.tar.bz2 openbsd-a19ae3196438c4679417520077f63a6a2e0adad4.zip |
sprinkle a few missing dependencies on perl scripts internal bits.
'it works' deraadt@
Diffstat (limited to 'src/lib/libcrypto/arch/amd64')
-rw-r--r-- | src/lib/libcrypto/arch/amd64/Makefile.inc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/lib/libcrypto/arch/amd64/Makefile.inc b/src/lib/libcrypto/arch/amd64/Makefile.inc index c254e59fe2..8b87562500 100644 --- a/src/lib/libcrypto/arch/amd64/Makefile.inc +++ b/src/lib/libcrypto/arch/amd64/Makefile.inc | |||
@@ -1,7 +1,10 @@ | |||
1 | # $OpenBSD: Makefile.inc,v 1.7 2016/11/11 03:49:14 beck Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.8 2017/08/20 17:53:13 espie Exp $ |
2 | 2 | ||
3 | # amd64-specific libcrypto build rules | 3 | # amd64-specific libcrypto build rules |
4 | 4 | ||
5 | # all amd64 code generators use this | ||
6 | EXTRA_PL = ${LCRYPTO_SRC}/perlasm/x86_64-xlate.pl | ||
7 | |||
5 | # aes | 8 | # aes |
6 | CFLAGS+= -DAES_ASM | 9 | CFLAGS+= -DAES_ASM |
7 | SSLASM+= aes aes-x86_64 | 10 | SSLASM+= aes aes-x86_64 |
@@ -49,13 +52,13 @@ SSLASM+= sha sha1-x86_64 | |||
49 | CFLAGS+= -DSHA256_ASM | 52 | CFLAGS+= -DSHA256_ASM |
50 | SRCS+= sha256-x86_64.S | 53 | SRCS+= sha256-x86_64.S |
51 | GENERATED+= sha256-x86_64.S | 54 | GENERATED+= sha256-x86_64.S |
52 | sha256-x86_64.S: ${LCRYPTO_SRC}/sha/asm/sha512-x86_64.pl | 55 | sha256-x86_64.S: ${LCRYPTO_SRC}/sha/asm/sha512-x86_64.pl ${EXTRA_PL} |
53 | cd ${LCRYPTO_SRC}/sha/asm ; \ | 56 | cd ${LCRYPTO_SRC}/sha/asm ; \ |
54 | /usr/bin/perl ./sha512-x86_64.pl ${.OBJDIR}/${.TARGET} | 57 | /usr/bin/perl ./sha512-x86_64.pl ${.OBJDIR}/${.TARGET} |
55 | CFLAGS+= -DSHA512_ASM | 58 | CFLAGS+= -DSHA512_ASM |
56 | SRCS+= sha512-x86_64.S | 59 | SRCS+= sha512-x86_64.S |
57 | GENERATED+= sha512-x86_64.S | 60 | GENERATED+= sha512-x86_64.S |
58 | sha512-x86_64.S: ${LCRYPTO_SRC}/sha/asm/sha512-x86_64.pl | 61 | sha512-x86_64.S: ${LCRYPTO_SRC}/sha/asm/sha512-x86_64.pl ${EXTRA_PL} |
59 | cd ${LCRYPTO_SRC}/sha/asm ; \ | 62 | cd ${LCRYPTO_SRC}/sha/asm ; \ |
60 | /usr/bin/perl ./sha512-x86_64.pl ${.OBJDIR}/${.TARGET} | 63 | /usr/bin/perl ./sha512-x86_64.pl ${.OBJDIR}/${.TARGET} |
61 | # whrlpool | 64 | # whrlpool |
@@ -65,7 +68,7 @@ SSLASM+= whrlpool wp-x86_64 | |||
65 | .for dir f in ${SSLASM} | 68 | .for dir f in ${SSLASM} |
66 | SRCS+= ${f}.S | 69 | SRCS+= ${f}.S |
67 | GENERATED+=${f}.S | 70 | GENERATED+=${f}.S |
68 | ${f}.S: ${LCRYPTO_SRC}/${dir}/asm/${f}.pl | 71 | ${f}.S: ${LCRYPTO_SRC}/${dir}/asm/${f}.pl ${EXTRA_PL} |
69 | (cd ${LCRYPTO_SRC}/${dir} ; \ | 72 | (cd ${LCRYPTO_SRC}/${dir} ; \ |
70 | /usr/bin/perl ./asm/${f}.pl openbsd) > ${.TARGET} | 73 | /usr/bin/perl ./asm/${f}.pl openbsd) > ${.TARGET} |
71 | .endfor | 74 | .endfor |
@@ -74,6 +77,6 @@ CFLAGS+= -DOPENSSL_CPUID_OBJ | |||
74 | SRCS+= x86_64cpuid.S x86_64-gcc.c | 77 | SRCS+= x86_64cpuid.S x86_64-gcc.c |
75 | GENERATED+=x86_64cpuid.S | 78 | GENERATED+=x86_64cpuid.S |
76 | 79 | ||
77 | x86_64cpuid.S: ${LCRYPTO_SRC}/x86_64cpuid.pl | 80 | x86_64cpuid.S: ${LCRYPTO_SRC}/x86_64cpuid.pl ${EXTRA_PL} |
78 | (cd ${LCRYPTO_SRC}/${dir} ; \ | 81 | (cd ${LCRYPTO_SRC}/${dir} ; \ |
79 | /usr/bin/perl ./x86_64cpuid.pl) > ${.TARGET} | 82 | /usr/bin/perl ./x86_64cpuid.pl) > ${.TARGET} |