Date: Tue, 14 Apr 2020 01:07:58 +0000 (UTC) From: "Simon J. Gerraty" <sjg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359913 - in stable/12: lib/libveriexec share/mk Message-ID: <202004140107.03E17wNo015715@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sjg Date: Tue Apr 14 01:07:58 2020 New Revision: 359913 URL: https://svnweb.freebsd.org/changeset/base/359913 Log: Do not claim libbearssl et al are INTERNALLIB If INTERNALLIB is defined we need PIE and bsd.incs.mk is not included. MFC of r359502 PR: 245189 Reviewed by: emaste Differential Revision: https://reviews.freebsd.org//D24233 Modified: stable/12/lib/libveriexec/Makefile stable/12/share/mk/src.libnames.mk Modified: stable/12/lib/libveriexec/Makefile ============================================================================== --- stable/12/lib/libveriexec/Makefile Tue Apr 14 01:05:11 2020 (r359912) +++ stable/12/lib/libveriexec/Makefile Tue Apr 14 01:07:58 2020 (r359913) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> LIB= veriexec MAN= veriexec.3 Modified: stable/12/share/mk/src.libnames.mk ============================================================================== --- stable/12/share/mk/src.libnames.mk Tue Apr 14 01:05:11 2020 (r359912) +++ stable/12/share/mk/src.libnames.mk Tue Apr 14 01:07:58 2020 (r359913) @@ -214,18 +214,18 @@ _LIBRARIES+= \ .endif .if ${MK_BEARSSL} == "yes" -_INTERNALLIBS+= \ +_LIBRARIES+= \ bearssl \ secureboot \ -LIBBEARSSL?= ${LIBBEARSSLDIR}/libbearssl${PIE_SUFFIX}.a -LIBSECUREBOOT?= ${LIBSECUREBOOTDIR}/libsecureboot${PIE_SUFFIX}.a +LIBBEARSSL?= ${LIBBEARSSLDIR}/libbearssl.a +LIBSECUREBOOT?= ${LIBSECUREBOOTDIR}/libsecureboot.a .endif .if ${MK_VERIEXEC} == "yes" -_INTERNALLIBS+= veriexec +_LIBRARIES+= veriexec -LIBVERIEXEC?= ${LIBVERIEXECDIR}/libveriexec${PIE_SUFFIX}.a +LIBVERIEXEC?= ${LIBVERIEXECDIR}/libveriexec.a .endif # Each library's LIBADD needs to be duplicated here for static linkage of
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004140107.03E17wNo015715>