Date: Thu, 20 Sep 2018 21:59:47 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r338844 - in projects/openssl111/secure/lib/libcrypto/engines: . capi lib4758cca libaep libatalla libcapi libchil libcswift libgost libnuron libsureware libubsec padlock Message-ID: <201809202159.w8KLxlp9075212@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Thu Sep 20 21:59:47 2018 New Revision: 338844 URL: https://svnweb.freebsd.org/changeset/base/338844 Log: Connect engines to the build. Added: projects/openssl111/secure/lib/libcrypto/engines/capi/ projects/openssl111/secure/lib/libcrypto/engines/capi/Makefile (contents, props changed) projects/openssl111/secure/lib/libcrypto/engines/padlock/ projects/openssl111/secure/lib/libcrypto/engines/padlock/Makefile (contents, props changed) Deleted: projects/openssl111/secure/lib/libcrypto/engines/lib4758cca/ projects/openssl111/secure/lib/libcrypto/engines/libaep/ projects/openssl111/secure/lib/libcrypto/engines/libatalla/ projects/openssl111/secure/lib/libcrypto/engines/libcapi/ projects/openssl111/secure/lib/libcrypto/engines/libchil/ projects/openssl111/secure/lib/libcrypto/engines/libcswift/ projects/openssl111/secure/lib/libcrypto/engines/libgost/ projects/openssl111/secure/lib/libcrypto/engines/libnuron/ projects/openssl111/secure/lib/libcrypto/engines/libsureware/ projects/openssl111/secure/lib/libcrypto/engines/libubsec/ Modified: projects/openssl111/secure/lib/libcrypto/engines/Makefile projects/openssl111/secure/lib/libcrypto/engines/Makefile.inc Modified: projects/openssl111/secure/lib/libcrypto/engines/Makefile ============================================================================== --- projects/openssl111/secure/lib/libcrypto/engines/Makefile Thu Sep 20 21:36:52 2018 (r338843) +++ projects/openssl111/secure/lib/libcrypto/engines/Makefile Thu Sep 20 21:59:47 2018 (r338844) @@ -1,6 +1,9 @@ # $FreeBSD$ -#SUBDIR= lib4758cca libaep libatalla libcapi libchil libcswift libgost \ -# libnuron libsureware libubsec +SUBDIR= capi +.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" +SUBDIR+= padlock +.endif SUBDIR_PARALLEL= + .include <bsd.subdir.mk> Modified: projects/openssl111/secure/lib/libcrypto/engines/Makefile.inc ============================================================================== --- projects/openssl111/secure/lib/libcrypto/engines/Makefile.inc Thu Sep 20 21:36:52 2018 (r338843) +++ projects/openssl111/secure/lib/libcrypto/engines/Makefile.inc Thu Sep 20 21:59:47 2018 (r338844) @@ -1,6 +1,20 @@ # $FreeBSD$ +SHLIBDIR?= /usr/lib/engines + LCRYPTO_SRC= ${SRCTOP}/crypto/openssl -.PATH: ${LCRYPTO_SRC}/engines ${LCRYPTO_SRC}/engines/ccgost -SHLIBDIR?= /usr/lib/engines +CFLAGS+= -I${LCRYPTO_SRC}/engines +CFLAGS+= -I${LCRYPTO_SRC}/include +CFLAGS+= -I${OBJTOP}/secure/lib/libcrypto + +.include <bsd.endian.mk> + +.if ${TARGET_ENDIANNESS} == 1234 +CFLAGS+= -DL_ENDIAN +.elif ${TARGET_ENDIANNESS} == 4321 +CFLAGS+= -DB_ENDIAN +.endif +CFLAGS+= -DNDEBUG + +.PATH: ${LCRYPTO_SRC}/engines Added: projects/openssl111/secure/lib/libcrypto/engines/capi/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/openssl111/secure/lib/libcrypto/engines/capi/Makefile Thu Sep 20 21:59:47 2018 (r338844) @@ -0,0 +1,7 @@ +# $FreeBSD$ + +SHLIB_NAME?= capi.so + +SRCS= e_capi.c + +.include <bsd.lib.mk> Added: projects/openssl111/secure/lib/libcrypto/engines/padlock/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/openssl111/secure/lib/libcrypto/engines/padlock/Makefile Thu Sep 20 21:59:47 2018 (r338844) @@ -0,0 +1,14 @@ +# $FreeBSD$ + +SHLIB_NAME?= padlock.so + +SRCS= e_padlock.c +.if ${MACHINE_CPUARCH} == "amd64" +SRCS+= e_padlock-x86_64.S +.elif ${MACHINE_CPUARCH} == "i386" +SRCS+= e_padlock-x86.S +.endif + +.include <bsd.lib.mk> + +.PATH: ${.CURDIR:H:H}/${MACHINE_CPUARCH}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809202159.w8KLxlp9075212>