Module Name:    src
Committed By:   christos
Date:           Wed Mar  4 17:22:49 UTC 2020

Modified Files:
        src/external/mit/libcbor/lib: Makefile

Log Message:
Fix vax and platforms that don't have ldexp in libc (aarch64, ppc64, ia64)


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/libcbor/lib/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/libcbor/lib/Makefile
diff -u src/external/mit/libcbor/lib/Makefile:1.2 src/external/mit/libcbor/lib/Makefile:1.3
--- src/external/mit/libcbor/lib/Makefile:1.2	Tue Mar  3 18:32:58 2020
+++ src/external/mit/libcbor/lib/Makefile	Wed Mar  4 12:22:49 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/03/03 23:32:58 mlelstv Exp $
+# $NetBSD: Makefile,v 1.3 2020/03/04 17:22:49 christos Exp $
 
 NOLINT=
 NOMAN=
@@ -10,10 +10,18 @@ DIST = ${.CURDIR}/../dist
 
 CPPFLAGS+= -I${DIST}/src -DHAVE_ENDIAN_H -I. -DEIGHT_BYTE_SIZE_T
 
+.if ${MACHINE} == "vax"
+# vax does not have NaN (no ieee754, so this code will not work anyway)
+CPPFLAGS+=-DNAN=INFINITY
+.endif
+
 LIB=    cbor
 
 SRCS+=   cbor.c
 
+# For ldexp
+LIBDPLIBS = m ${NETBSDSRCDIR}/lib/libm
+
 VERS_FILE=${DIST}/CMakeLists.txt
 
 .for i in MAJOR MINOR PATCH

Reply via email to