summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Bluhm <bluhm@cvs.openbsd.org>2017-07-29 12:45:57 +0000
committerAlexander Bluhm <bluhm@cvs.openbsd.org>2017-07-29 12:45:57 +0000
commitabbd90a9b2ff5860f0647eb39d9a17b66119b069 (patch)
treed272a11d1cb318ab74c41f5fc9cad9512224f653
parent62586ea65f4aed0ae02806264d808f2ed672dcc3 (diff)
Use linker flags that build and run the test with gcc and clang.
Add missing #include to fix clang warning.
-rw-r--r--regress/misc/X11/blt/Makefile5
-rw-r--r--regress/misc/X11/bltone/Makefile5
-rw-r--r--regress/misc/X11/bltone/bltone.c3
3 files changed, 8 insertions, 5 deletions
diff --git a/regress/misc/X11/blt/Makefile b/regress/misc/X11/blt/Makefile
index b5e16790653..960ba1486be 100644
--- a/regress/misc/X11/blt/Makefile
+++ b/regress/misc/X11/blt/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.2 2006/02/04 13:59:39 kettenis Exp $
+# $OpenBSD: Makefile,v 1.3 2017/07/29 12:45:56 bluhm Exp $
PROG= blt
-LDADD+= -L/usr/X11R6/lib/modules -R/usr/X11R6/lib/modules -lfb
+LDADD+= -L/usr/X11R6/lib -L/usr/X11R6/lib/modules -lfb
+LDADD+= -Wl,-rpath /usr/X11R6/lib/modules
LDADD+= -Wl,--allow-shlib-undefined
.include <bsd.regress.mk>
diff --git a/regress/misc/X11/bltone/Makefile b/regress/misc/X11/bltone/Makefile
index be1b4652158..9dbcb62aa6c 100644
--- a/regress/misc/X11/bltone/Makefile
+++ b/regress/misc/X11/bltone/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.2 2006/02/04 13:59:39 kettenis Exp $
+# $OpenBSD: Makefile,v 1.3 2017/07/29 12:45:56 bluhm Exp $
PROG= bltone
-LDADD+= -L/usr/X11R6/lib/modules -R/usr/X11R6/lib/modules -lfb
+LDADD+= -L/usr/X11R6/lib -L/usr/X11R6/lib/modules -lfb
+LDADD+= -Wl,-rpath /usr/X11R6/lib/modules
LDADD+= -Wl,--allow-shlib-undefined
.include <bsd.regress.mk>
diff --git a/regress/misc/X11/bltone/bltone.c b/regress/misc/X11/bltone/bltone.c
index 575e554f038..d3c30b60554 100644
--- a/regress/misc/X11/bltone/bltone.c
+++ b/regress/misc/X11/bltone/bltone.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bltone.c,v 1.6 2014/09/27 06:28:45 doug Exp $ */
+/* $OpenBSD: bltone.c,v 1.7 2017/07/29 12:45:56 bluhm Exp $ */
/*
* Written by Mark Kettenis <kettenis@openbsd.org> 2004 Public Domain
*/
@@ -9,6 +9,7 @@
#include <assert.h>
#include <stddef.h>
#include <string.h>
+#include <unistd.h>
typedef unsigned FbStip;
typedef unsigned FbBits;