From 1ae7480bd29e30a350147e42d838155e3cd1f167 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 22 Sep 2025 15:34:43 +0100 Subject: [PATCH 1/2] src/Makefile.am: trim trailing whitespace Signed-off-by: Luca Boccassi --- src/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index cfabb746b..1ff048f91 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,7 +5,7 @@ # AM_CFLAGS = @AM_CFLAGS@ -AM_LDFLAGS = @AM_LDFLAGS@ $(HARDENING_LDFLAGS) $(SANITIZERS) $(FUZZER) +AM_LDFLAGS = @AM_LDFLAGS@ $(HARDENING_LDFLAGS) $(SANITIZERS) $(FUZZER) noinst_LTLIBRARIES = noinst_HEADERS = @@ -156,7 +156,7 @@ libtpms_tpm12_la_CFLAGS += $(shell nss-config --cflags) #including nss3/blapi.h requires a look into nspr4 dir libtpms_tpm12_la_CFLAGS += $(shell nspr-config --cflags) -else +else if LIBTPMS_USE_OPENSSL From 76c834680bb1dafbf06ae2e8711faa2e5be7ef54 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 22 Sep 2025 15:35:28 +0100 Subject: [PATCH 2/2] test: do not run localcheck test on powerpc64 There is a spurious failure on powerpc64: $ gcc -nostdlib -Lsrc/.libs -ltpms /usr/bin/ld: src/.libs/libtpms.so: ABI version 1 is not compatible with ABI version 0 output /usr/bin/ld: failed to merge target specific data of file src/.libs/libtpms.so /usr/bin/ld: warning: cannot find entry symbol _start; defaulting to 00000000000000d8 collect2: error: ld returned 1 exit status This is likely a linker bug, which has been reported, but even if it is fixed, it will take a long time before it is available: https://sourceware.org/bugzilla/show_bug.cgi?id=17742#c7 Signed-off-by: Luca Boccassi --- src/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 1ff048f91..a55bedc49 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -668,7 +668,7 @@ check-local: darwin*|freebsd*) LDFLAGS_OS="-shared" ;; \ *) ADDLIBS="" ;; \ esac; \ - ($(CC) $$LDFLAGS_OS $(LDFLAGS_ARCH) -nostdlib -L./.libs -ltpms $$ADDLIBS 2>/dev/null || \ + [[ "$(host_cpu)" =~ "powerpc64" ]] || ($(CC) $$LDFLAGS_OS $(LDFLAGS_ARCH) -nostdlib -L./.libs -ltpms $$ADDLIBS 2>/dev/null || \ (echo "There are undefined symbols in libtpms ($$LDFLAGS_OS $(LDFLAGS_ARCH))";\ $(CC) $$LDFLAGS_OS $(LDFLAGS_ARCH) -nostdlib -L./.libs -ltpms $$ADDLIBS 2>&1 | grep libtpms)) @case $(host_os) in \ @@ -676,7 +676,7 @@ check-local: darwin*|freebsd*) LDFLAGS_OS="-shared" ;; \ *) ADDLIBS="" ;; \ esac; \ - $(CC) $$LDFLAGS_OS $(LDFLAGS_ARCH) -nostdlib -L./.libs -ltpms $$ADDLIBS 2>/dev/null + [[ "$(host_cpu)" =~ "powerpc64" ]] || $(CC) $$LDFLAGS_OS $(LDFLAGS_ARCH) -nostdlib -L./.libs -ltpms $$ADDLIBS 2>/dev/null rm a.out || true EXTRA_DIST = \