Link the runtests programs statically and explain why.

diff --git a/regress/lib/libexpat/Makefile.inc b/regress/lib/libexpat/Makefile.inc
index cc8d1ae..ed69374 100644 (file)
--- a/regress/lib/libexpat/Makefile.inc
+++ b/regress/lib/libexpat/Makefile.inc
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile.inc,v 1.1.1.1 2017/06/30 14:56:08 bluhm Exp $
+# $OpenBSD: Makefile.inc,v 1.2 2017/07/06 13:11:15 bluhm Exp $
 
 EXPATDIR=      ${.CURDIR}/../../../../lib/libexpat
 .PATH:         ${EXPATDIR}/tests ${EXPATDIR}/tests/benchmark
 PROG=          ${.CURDIR:T}
-CFLAGS=                -g -I${EXPATDIR}/lib
-CPPFLAGS=      -g -I${EXPATDIR}/lib
-LDFLAGS=       -g -static
+CFLAGS=                -I${EXPATDIR}/lib
+CPPFLAGS=      -I${EXPATDIR}/lib
 LDADD=         -lexpat
 DPADD=         ${LIBEXPAT}
+DEBUG?=                -g

diff --git a/regress/lib/libexpat/runtests/Makefile b/regress/lib/libexpat/runtests/Makefile
index bc37ec0..97c6786 100644 (file)
--- a/regress/lib/libexpat/runtests/Makefile
+++ b/regress/lib/libexpat/runtests/Makefile
@@ -1,5 +1,7 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2017/06/30 14:56:08 bluhm Exp $
+# $OpenBSD: Makefile,v 1.2 2017/07/06 13:11:15 bluhm Exp $
 
 SRCS=          runtests.c chardata.c memcheck.c minicheck.c
+# align_limit_to_full_utf8_characters is not exported in dynamic library
+LDFLAGS=       -static
 
 .include <bsd.regress.mk>

diff --git a/regress/lib/libexpat/runtestspp/Makefile b/regress/lib/libexpat/runtestspp/Makefile
index 9baae15..e32f015 100644 (file)
--- a/regress/lib/libexpat/runtestspp/Makefile
+++ b/regress/lib/libexpat/runtestspp/Makefile
@@ -1,5 +1,7 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2017/06/30 14:56:08 bluhm Exp $
+# $OpenBSD: Makefile,v 1.2 2017/07/06 13:11:15 bluhm Exp $
 
 SRCS=          runtestspp.cpp chardata.c memcheck.c minicheck.c
+# align_limit_to_full_utf8_characters is not exported in dynamic library
+LDFLAGS=       -static
 
 .include <bsd.regress.mk>