This version is slightly better than rev 1.10. There are still missing
dependencies for openssl/*.h. I cannot reproduce any critical race conditions with this revision.
This commit is contained in:
parent
f80c5c4a34
commit
f254f0ac49
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=60610
@ -15,13 +15,11 @@ CFLAGS+= -DDEVRANDOM=\"/dev/urandom\"
|
|||||||
|
|
||||||
WITH_RSA?= YES
|
WITH_RSA?= YES
|
||||||
|
|
||||||
SRCS+= buildinf.h
|
SRCS+= buildinf.h openssl/opensslconf.h
|
||||||
CLEANFILES+= buildinf.h
|
CLEANFILES+= buildinf.h openssl/opensslconf.h
|
||||||
CLEANDIRS+= openssl
|
CLEANDIRS+= openssl
|
||||||
|
|
||||||
# this bogus dependency was the easiest way to get the openssl/
|
buildinf.h:
|
||||||
# directory populated
|
|
||||||
buildinf.h: openssl/opensslconf.h openssl/headers-copied
|
|
||||||
( echo "#ifndef MK1MF_BUILD"; \
|
( echo "#ifndef MK1MF_BUILD"; \
|
||||||
echo " /* auto-generated by crypto/Makefile.ssl for crypto/cversion.c */"; \
|
echo " /* auto-generated by crypto/Makefile.ssl for crypto/cversion.c */"; \
|
||||||
echo " #define CFLAGS \"$(CC)\""; \
|
echo " #define CFLAGS \"$(CC)\""; \
|
||||||
@ -29,11 +27,11 @@ buildinf.h: openssl/opensslconf.h openssl/headers-copied
|
|||||||
echo " #define DATE \"`LC_TIME=C date`\""; \
|
echo " #define DATE \"`LC_TIME=C date`\""; \
|
||||||
echo "#endif" ) > ${.TARGET}
|
echo "#endif" ) > ${.TARGET}
|
||||||
|
|
||||||
openssl/opensslconf.h: ../libcrypto/opensslconf-${MACHINE_ARCH}.h
|
# XXX: The openssl/ dependencies are not correct, in that a change in
|
||||||
@mkdir -p openssl
|
# any of ${CRYPTO_HDRS} ${EXTRA_HDRS} will no repopulate openssl/.
|
||||||
cp ${.OODATE} ${.TARGET}
|
# This deficiency will be fixed in a later commit.
|
||||||
|
|
||||||
openssl/headers-copied:
|
openssl/opensslconf.h: ../libcrypto/opensslconf-${MACHINE_ARCH}.h
|
||||||
@mkdir -p openssl
|
mkdir -p openssl
|
||||||
|
cp ${.OODATE} ${.TARGET}
|
||||||
${INSTALL} ${COPY} -m 444 ${CRYPTO_HDRS} ${EXTRA_HDRS} openssl
|
${INSTALL} ${COPY} -m 444 ${CRYPTO_HDRS} ${EXTRA_HDRS} openssl
|
||||||
@touch ${.TARGET}
|
|
||||||
|
Loading…
Reference in New Issue
Block a user