Date: Mon, 1 Jun 2020 18:58:09 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361700 - in head: etc/mtree secure/lib/libcrypto secure/lib/libcrypto/engines Message-ID: <202006011858.051Iw9ED092330@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Mon Jun 1 18:58:09 2020 New Revision: 361700 URL: https://svnweb.freebsd.org/changeset/base/361700 Log: Install 32-bit libcrypto engines in /usr/lib32/engines instead of /usr/lib32 and let 32-bit libcrypto search that location instead of /usr/lib/engines. Reviewed by: jkim Modified: head/etc/mtree/BSD.lib32.dist head/secure/lib/libcrypto/Makefile.inc head/secure/lib/libcrypto/engines/Makefile.inc Modified: head/etc/mtree/BSD.lib32.dist ============================================================================== --- head/etc/mtree/BSD.lib32.dist Mon Jun 1 18:43:51 2020 (r361699) +++ head/etc/mtree/BSD.lib32.dist Mon Jun 1 18:58:09 2020 (r361700) @@ -8,6 +8,8 @@ lib32 dtrace .. + engines + .. geom .. i18n Modified: head/secure/lib/libcrypto/Makefile.inc ============================================================================== --- head/secure/lib/libcrypto/Makefile.inc Mon Jun 1 18:43:51 2020 (r361699) +++ head/secure/lib/libcrypto/Makefile.inc Mon Jun 1 18:58:09 2020 (r361700) @@ -75,7 +75,7 @@ CFLAGS+= -DPOLY1305_ASM .if defined(LIB) CFLAGS+= -DOPENSSLDIR="\"/etc/ssl\"" -CFLAGS+= -DENGINESDIR="\"/usr/lib/engines\"" +CFLAGS+= -DENGINESDIR="\"${LIBDIR}/engines\"" .endif CFLAGS+= -DNDEBUG Modified: head/secure/lib/libcrypto/engines/Makefile.inc ============================================================================== --- head/secure/lib/libcrypto/engines/Makefile.inc Mon Jun 1 18:43:51 2020 (r361699) +++ head/secure/lib/libcrypto/engines/Makefile.inc Mon Jun 1 18:58:09 2020 (r361700) @@ -1,6 +1,6 @@ # $FreeBSD$ -SHLIBDIR?= /usr/lib/engines +SHLIBDIR= ${LIBDIR}/engines LCRYPTO_SRC= ${SRCTOP}/crypto/openssl
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006011858.051Iw9ED092330>