trousers: Make this build again.
- Downgrade address-of-packed-member errors to warnings. Not sure if this is safe, but there's too many to audit. - Silence deprecation warnings for openssl3. - Address removal of const qualifier in iconv. - Nix unused definitions in a .h file, which cause trouble now that -fno-common is the default.
This commit is contained in:
parent
f0dcd50e0e
commit
eb1aff76b3
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.2 2019/01/07 15:18:03 christos Exp $
|
||||
# $NetBSD: Makefile,v 1.3 2023/08/10 06:56:12 riastradh Exp $
|
||||
.include "../Makefile.inc"
|
||||
|
||||
.PATH.c: ${DIST}/src/tcsd
|
||||
|
@ -6,6 +6,8 @@
|
|||
CPPFLAGS+=-DAPPID=\"TCSD\" -DVAR_PREFIX=\"/var\" -DETC_PREFIX=\"/etc\"
|
||||
CPPFLAGS+=-DTSS_BUILD_PS -DTSS_BUILD_PCR_EVENTS
|
||||
|
||||
COPTS.tcsd_threads.c+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
|
||||
|
||||
BINDIR=/usr/sbin
|
||||
PROG=tcsd
|
||||
SRCS=\
|
||||
|
|
|
@ -170,7 +170,7 @@ void *tcsd_thread_run(void *);
|
|||
void thread_signal_init();
|
||||
|
||||
/* signal handling */
|
||||
#ifndef __APPLE__
|
||||
#if !defined(__APPLE__) && !defined(__NetBSD__)
|
||||
struct sigaction tcsd_sa_int;
|
||||
struct sigaction tcsd_sa_chld;
|
||||
#endif
|
||||
|
|
|
@ -118,9 +118,9 @@ typedef struct tdTSS_KEY {
|
|||
BYTE *encData;
|
||||
} TSS_KEY;
|
||||
|
||||
#if (defined (__linux) || defined (linux) || defined (SOLARIS) || defined (__GLIBC__))
|
||||
#if (defined (__linux) || defined (linux) || defined (SOLARIS) || defined (__GLIBC__) || defined (__NetBSD__))
|
||||
#define BSD_CONST
|
||||
#elif defined (__OpenBSD__) || defined (__FreeBSD__) || defined (__NetBSD__) || defined (__APPLE__)
|
||||
#elif defined (__OpenBSD__) || defined (__FreeBSD__) || defined (__APPLE__)
|
||||
#define BSD_CONST const
|
||||
#endif
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.1 2012/01/28 02:15:26 christos Exp $
|
||||
# $NetBSD: Makefile,v 1.2 2023/08/10 06:56:12 riastradh Exp $
|
||||
|
||||
LIBISPRIVATE=yes
|
||||
.include "../Makefile.inc"
|
||||
|
@ -18,6 +18,8 @@ CPPFLAGS+=-DTSS_BUILD_PCR_EXTEND -DTSS_BUILD_SELFTEST -DTSS_BUILD_NV
|
|||
CPPFLAGS+=-DTSS_BUILD_AUDIT -DTSS_BUILD_SEALX -DTSS_BUILD_TSS12
|
||||
CPPFLAGS+=-DTSS_BUILD_DELEGATION -DTSS_BUILD_QUOTE2 -DTSS_BUILD_CMK
|
||||
|
||||
COPTS.tcs_key.c+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
|
||||
|
||||
LIB=tcs
|
||||
SRCS=\
|
||||
crypto.c \
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.3 2019/01/07 15:43:17 christos Exp $
|
||||
# $NetBSD: Makefile,v 1.4 2023/08/10 06:56:12 riastradh Exp $
|
||||
.include "../Makefile.inc"
|
||||
|
||||
CPPFLAGS+=-DAPPID=\"TSPI\" -DVAR_PREFIX=\"/var\" -DETC_PREFIX=\"/etc\"
|
||||
|
@ -16,6 +16,10 @@ CPPFLAGS+=-DTSS_BUILD_ENCDATA_LIST -DTSS_BUILD_RSAKEY_LIST -DTSS_BUILD_ASN1
|
|||
CPPFLAGS+=-DTSS_BUILD_AUDIT -DTSS_BUILD_SEALX -DTSS_BUILD_QUOTE2
|
||||
CPPFLAGS+=-DTSS_BUILD_NV -DTSS_BUILD_DELEGATION -DTSS_BUILD_CMK
|
||||
|
||||
COPTS.rpc.c+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
|
||||
COPTS.hash.c+= -Wno-error=deprecated-declarations # openssl3 PKCS1_MGF
|
||||
COPTS.rsa.c+= -Wno-error=deprecated-declarations # openssl3 RSA_*
|
||||
|
||||
TSPI=${DIST}/src/tspi
|
||||
TRSPI=${DIST}/src/trspi
|
||||
.PATH.c: ${TSPI} ${TSPI}/rpc ${TSPI}/rpc/tcstp ${TSPI}/ps ${TRSPI} ${TRSPI}/crypto/${EXTERNAL_OPENSSL_SUBDIR}
|
||||
|
|
Loading…
Reference in New Issue