diff options
| author | Simon Glass <sjg@chromium.org> | 2022-09-09 15:36:05 -0600 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-09-15 16:15:54 +0000 |
| commit | 9f2e9804b492f8fccc060e013b12de9679cca246 (patch) | |
| tree | 0a7d593b64bc514233bec664c1b533ffbaa48e3b | |
| parent | 62cc7885eab5d5ab0a7d773fb5284b4ca9ee097c (diff) | |
| download | vboot-stabilize-15120.B.tar.gz | |
Avoid build failures on recent distrosstabilize-15129.Bstabilize-15122.Bstabilize-15120.B
Emit a warning and continue when OpenSSL is newer than expected. The
chroot still uses an older version.
BUG=b:245993083, b:246328810
BRANCH=none
TEST=make -C ~/cosarm/src/platform/vboot_reference/ USE_FLASHROM=0
See that the errors become warnings
Signed-off-by: Simon Glass <sjg@chromium.org>
Change-Id: I85afba4007da3bc7c37abc04d744185c3362ad99
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3887562
Reviewed-by: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
| -rw-r--r-- | Makefile | 19 |
1 files changed, 19 insertions, 0 deletions
@@ -288,6 +288,9 @@ ifeq ($(HAVE_CROSID),1) CROSID_LIBS := $(shell ${PKG_CONFIG} --libs crosid) endif +# Get major version of openssl (e.g. version 3.0.5 -> "3") +OPENSSL_VERSION := $(shell ${PKG_CONFIG} --modversion openssl | cut -d. -f1) + # Determine QEMU architecture needed, if any ifeq (${ARCH},${HOST_ARCH}) # Same architecture; no need for QEMU @@ -456,6 +459,14 @@ COMMONLIB_SRCS += \ # Intermediate library for the vboot_reference utilities to link against. UTILLIB = ${BUILD}/libvboot_util.a +# Avoid build failures outside the chroot on Ubuntu 2022.04 +# e.g.: +# host/lib/host_key2.c:103:17: error: ‘RSA_free’ is deprecated: Since OpenSSL 3.0 +# [-Werror=deprecated-declarations] +ifeq ($(OPENSSL_VERSION),3) +${UTILLIB}: CFLAGS += -Wno-error=deprecated-declarations +endif + UTILLIB_SRCS = \ cgpt/cgpt_add.c \ cgpt/cgpt_boot.c \ @@ -690,6 +701,14 @@ FUTIL_OBJS = ${FUTIL_SRCS:%.c=${BUILD}/%.o} ${FUTIL_CMD_LIST:%.c=%.o} ${FUTIL_OBJS}: INCLUDES += -Ihost/lib21/include +# Avoid build failures outside the chroot on Ubuntu 2022.04 +# e.g.: +# futility/cmd_create.c:161:9: warning: ‘RSA_free’ is deprecated: Since OpenSSL 3.0 +# [-Wdeprecated-declarations] +ifeq ($(OPENSSL_VERSION),3) +${FUTIL_OBJS}: CFLAGS += -Wno-error=deprecated-declarations +endif + ALL_OBJS += ${FUTIL_OBJS} |