sprinkle a few missing dependencies on perl scripts internal bits.

'it works' deraadt@

3 files changed, 17 insertions, 11 deletions

diff --git a/src/lib/libcrypto/Makefile b/src/lib/libcrypto/Makefile
index 77c0b06ffc..7ad76c881a 100644
--- a/src/lib/libcrypto/Makefile
+++ b/src/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2017/08/13 19:42:33 doug Exp $
+# $OpenBSD: Makefile,v 1.22 2017/08/20 17:53:12 espie Exp $
 
 LIB=    crypto
 LIBREBUILD=y
@@ -419,11 +419,11 @@ GENERATED=obj_mac.h obj_dat.h
 CLEANFILES+=${GENERATED} obj_mac.num.tmp
 SSL_OBJECTS=${LCRYPTO_SRC}/objects
 
-obj_mac.h: ${SSL_OBJECTS}/objects.h ${SSL_OBJECTS}/obj_mac.num ${SSL_OBJECTS}/objects.txt
+obj_mac.h: ${SSL_OBJECTS}/objects.h ${SSL_OBJECTS}/obj_mac.num ${SSL_OBJECTS}/objects.txt ${SSL_OBJECTS}/objects.pl
         cat ${SSL_OBJECTS}/obj_mac.num > obj_mac.num.tmp
         /usr/bin/perl ${SSL_OBJECTS}/objects.pl ${SSL_OBJECTS}/objects.txt obj_mac.num.tmp obj_mac.h
 
-obj_dat.h: obj_mac.h
+obj_dat.h: obj_mac.h ${SSL_OBJECTS}/obj_dat.pl
         /usr/bin/perl ${SSL_OBJECTS}/obj_dat.pl obj_mac.h obj_dat.h
 
 .if exists (${.CURDIR}/arch/${MACHINE_CPU}/Makefile.inc)
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 @@
-# $OpenBSD: Makefile.inc,v 1.7 2016/11/11 03:49:14 beck Exp $
+# $OpenBSD: Makefile.inc,v 1.8 2017/08/20 17:53:13 espie Exp $
 
 # amd64-specific libcrypto build rules
 
+# all amd64 code generators use this
+EXTRA_PL =      ${LCRYPTO_SRC}/perlasm/x86_64-xlate.pl
+
 # aes
 CFLAGS+= -DAES_ASM
 SSLASM+= aes aes-x86_64
@@ -49,13 +52,13 @@ SSLASM+= sha sha1-x86_64
 CFLAGS+= -DSHA256_ASM
 SRCS+= sha256-x86_64.S
 GENERATED+= sha256-x86_64.S
-sha256-x86_64.S: ${LCRYPTO_SRC}/sha/asm/sha512-x86_64.pl
+sha256-x86_64.S: ${LCRYPTO_SRC}/sha/asm/sha512-x86_64.pl ${EXTRA_PL}
         cd ${LCRYPTO_SRC}/sha/asm ; \
                 /usr/bin/perl ./sha512-x86_64.pl ${.OBJDIR}/${.TARGET}
 CFLAGS+= -DSHA512_ASM
 SRCS+= sha512-x86_64.S
 GENERATED+= sha512-x86_64.S
-sha512-x86_64.S: ${LCRYPTO_SRC}/sha/asm/sha512-x86_64.pl
+sha512-x86_64.S: ${LCRYPTO_SRC}/sha/asm/sha512-x86_64.pl ${EXTRA_PL}
         cd ${LCRYPTO_SRC}/sha/asm ; \
                 /usr/bin/perl ./sha512-x86_64.pl ${.OBJDIR}/${.TARGET}
 # whrlpool
@@ -65,7 +68,7 @@ SSLASM+= whrlpool wp-x86_64
 .for dir f in ${SSLASM}
 SRCS+=  ${f}.S
 GENERATED+=${f}.S
-${f}.S: ${LCRYPTO_SRC}/${dir}/asm/${f}.pl
+${f}.S: ${LCRYPTO_SRC}/${dir}/asm/${f}.pl ${EXTRA_PL}
         (cd ${LCRYPTO_SRC}/${dir} ; \
                 /usr/bin/perl ./asm/${f}.pl openbsd) > ${.TARGET}
 .endfor
@@ -74,6 +77,6 @@ CFLAGS+= -DOPENSSL_CPUID_OBJ
 SRCS+=  x86_64cpuid.S x86_64-gcc.c
 GENERATED+=x86_64cpuid.S
 
-x86_64cpuid.S: ${LCRYPTO_SRC}/x86_64cpuid.pl
+x86_64cpuid.S: ${LCRYPTO_SRC}/x86_64cpuid.pl ${EXTRA_PL}
         (cd ${LCRYPTO_SRC}/${dir} ; \
                 /usr/bin/perl ./x86_64cpuid.pl) > ${.TARGET}
diff --git a/src/lib/libcrypto/arch/i386/Makefile.inc b/src/lib/libcrypto/arch/i386/Makefile.inc
index 2744da8397..7986a0f54e 100644
--- a/src/lib/libcrypto/arch/i386/Makefile.inc
+++ b/src/lib/libcrypto/arch/i386/Makefile.inc
@@ -1,7 +1,10 @@
-# $OpenBSD: Makefile.inc,v 1.5 2016/11/04 18:12:13 miod Exp $
+# $OpenBSD: Makefile.inc,v 1.6 2017/08/20 17:53:13 espie Exp $
 
 # i386-specific libcrypto build rules
 
+# all i386 code generators use these
+EXTRA_PL =  ${LCRYPTO_SRC}/perlasm/x86gas.pl ${LCRYPTO_SRC}/perlasm/x86asm.pl
+
 # aes
 CFLAGS+= -DAES_ASM
 SSLASM+= aes aes-586
@@ -55,7 +58,7 @@ SSLASM+= whrlpool wp-mmx
 .for dir f in ${SSLASM}
 SRCS+=  ${f}.S
 GENERATED+=${f}.S
-${f}.S: ${LCRYPTO_SRC}/${dir}/asm/${f}.pl ${LCRYPTO_SRC}/perlasm/x86gas.pl
+${f}.S: ${LCRYPTO_SRC}/${dir}/asm/${f}.pl ${EXTRA_PL}
         /usr/bin/perl -I${LCRYPTO_SRC}/perlasm -I${LCRYPTO_SRC}/${dir}/asm \
                 ${LCRYPTO_SRC}/${dir}/asm/${f}.pl \
                     openbsd-elf ${CFLAGS} 386 ${PICFLAG} > ${.TARGET}
@@ -65,6 +68,6 @@ CFLAGS+= -DOPENSSL_CPUID_OBJ
 SRCS+=  x86cpuid.S
 GENERATED+=x86cpuid.S
 
-x86cpuid.S: ${LCRYPTO_SRC}/x86cpuid.pl ${LCRYPTO_SRC}/perlasm/x86gas.pl
+x86cpuid.S: ${LCRYPTO_SRC}/x86cpuid.pl ${EXTRA_PL}
         /usr/bin/perl -I${LCRYPTO_SRC}/perlasm ${LCRYPTO_SRC}/x86cpuid.pl \
                 openbsd-elf ${CFLAGS} 386 ${PICFLAG} > ${.TARGET}