Make the temporary file _evp.h instead of evp.h to not conflict with
the real evp.h. Reported by: markm
This commit is contained in:
parent
2422dd7973
commit
dd62c1ebeb
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=65060
@ -268,13 +268,13 @@ MLINKS= des_crypt.3 des_read_password.3 \
|
|||||||
des_crypt.3 des_enc_read.3 des_crypt.3 des_enc_write.3 \
|
des_crypt.3 des_enc_read.3 des_crypt.3 des_enc_write.3 \
|
||||||
des_crypt.3 des_set_odd_parity.3 des_crypt.3 des_is_weak_key.3
|
des_crypt.3 des_set_odd_parity.3 des_crypt.3 des_is_weak_key.3
|
||||||
|
|
||||||
beforeinstall: openssl/opensslconf.h openssl/evp.h
|
beforeinstall: openssl/opensslconf.h openssl/_evp.h
|
||||||
${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
|
${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
|
||||||
${CRYPTO_HDRS} openssl/opensslconf.h \
|
${CRYPTO_HDRS} openssl/opensslconf.h \
|
||||||
${DESTDIR}/usr/include/openssl
|
${DESTDIR}/usr/include/openssl
|
||||||
.if !defined(MAKE_IDEA) || ${MAKE_IDEA} != YES
|
.if !defined(MAKE_IDEA) || ${MAKE_IDEA} != YES
|
||||||
${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
|
${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
|
||||||
openssl/evp.h ${DESTDIR}/usr/include/openssl/evp.h
|
openssl/_evp.h ${DESTDIR}/usr/include/openssl/evp.h
|
||||||
.else
|
.else
|
||||||
${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
|
${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
|
||||||
${LCRYPTO_SRC}/evp/evp.h ${DESTDIR}/usr/include/openssl/evp.h
|
${LCRYPTO_SRC}/evp/evp.h ${DESTDIR}/usr/include/openssl/evp.h
|
||||||
|
@ -15,8 +15,8 @@ CFLAGS+= -DL_ENDIAN
|
|||||||
|
|
||||||
WITH_RSA?= YES
|
WITH_RSA?= YES
|
||||||
|
|
||||||
SRCS+= buildinf.h openssl/opensslconf.h openssl/evp.h
|
SRCS+= buildinf.h openssl/opensslconf.h openssl/_evp.h
|
||||||
CLEANFILES+= buildinf.h openssl/opensslconf.h openssl/evp.h
|
CLEANFILES+= buildinf.h openssl/opensslconf.h openssl/_evp.h
|
||||||
CLEANDIRS+= openssl
|
CLEANDIRS+= openssl
|
||||||
|
|
||||||
buildinf.h:
|
buildinf.h:
|
||||||
@ -31,10 +31,12 @@ buildinf.h:
|
|||||||
# any of ${CRYPTO_HDRS} ${EXTRA_HDRS} will no repopulate openssl/.
|
# any of ${CRYPTO_HDRS} ${EXTRA_HDRS} will no repopulate openssl/.
|
||||||
# This deficiency will be fixed in a later commit.
|
# This deficiency will be fixed in a later commit.
|
||||||
|
|
||||||
|
.ORDER: openssl/opensslconf.h openssl/_evp.h
|
||||||
|
|
||||||
openssl/opensslconf.h: ../libcrypto/opensslconf-${MACHINE_ARCH}.h
|
openssl/opensslconf.h: ../libcrypto/opensslconf-${MACHINE_ARCH}.h
|
||||||
mkdir -p openssl
|
mkdir -p openssl
|
||||||
cp ${.OODATE} ${.TARGET}
|
cp ${.OODATE} ${.TARGET}
|
||||||
${INSTALL} ${COPY} -m 444 ${CRYPTO_HDRS} ${EXTRA_HDRS} openssl
|
${INSTALL} ${COPY} -m 444 ${CRYPTO_HDRS} ${EXTRA_HDRS} openssl
|
||||||
|
|
||||||
openssl/evp.h: ${LCRYPTO_SRC}/evp/evp.h
|
openssl/_evp.h: ${LCRYPTO_SRC}/evp/evp.h
|
||||||
sed '/^#ifndef NO_IDEA$$/,/^#endif$$/d' ${.OODATE} > ${.TARGET}
|
sed '/^#ifndef NO_IDEA$$/,/^#endif$$/d' ${.OODATE} > ${.TARGET}
|
||||||
|
Loading…
Reference in New Issue
Block a user