cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unbreak tests for OpenBSD

Browse Source
This commit is contained in:
jasper 2014-10-15 18:24:15 +00:00
parent 1dddebc95a
commit d435cd1eef
3 changed files with 43 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x11/xkbcommon/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2014/10/06 12:29:34 jasper Exp $
# $OpenBSD: Makefile,v 1.3 2014/10/15 18:24:15 jasper Exp $
COMMENT= library to handle keyboard descriptions
@ -24,9 +24,6 @@ WANTLIB += Xau Xdmcp pthread-stubs xcb xcb-xkb
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --without-doxygen
# XXX: Too many Linuxisms
NO_TEST= Yes
# our pre-historic bison has been mummified and put into a museum.
# so generate parser.c with a fresh young bison that still roams the plains.
post-extract:

29
x11/xkbcommon/patches/patch-Makefile_in
View File

@ -1,9 +1,32 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2014/10/05 18:30:33 jasper Exp $
$OpenBSD: patch-Makefile_in,v 1.2 2014/10/15 18:24:15 jasper Exp $
- pre-generated parser.c is used
- OpenBSD lacks librt
--- Makefile.in.orig Sun Oct 5 20:20:11 2014
+++ Makefile.in Sun Oct 5 20:20:21 2014
--- Makefile.in.orig Tue Aug 19 19:18:26 2014
+++ Makefile.in Wed Oct 15 19:58:50 2014
@@ -886,7 +886,7 @@ test_keysym_LDADD = $(TESTS_LDADD)
test_filecomp_LDADD = $(TESTS_LDADD)
test_context_LDADD = $(TESTS_LDADD)
test_rules_file_CFLAGS = $(AM_CFLAGS) -Wno-declaration-after-statement
-test_rules_file_LDADD = $(TESTS_LDADD) -lrt
+test_rules_file_LDADD = $(TESTS_LDADD)
test_stringcomp_LDADD = $(TESTS_LDADD)
test_buffercomp_LDADD = $(TESTS_LDADD)
test_log_LDADD = $(TESTS_LDADD)
@@ -894,10 +894,10 @@ test_atom_LDADD = $(TESTS_LDADD)
test_utf8_LDADD = $(TESTS_LDADD)
test_rmlvo_to_kccgst_LDADD = $(TESTS_LDADD)
test_print_compiled_keymap_LDADD = $(TESTS_LDADD)
-test_bench_key_proc_LDADD = $(TESTS_LDADD) -lrt
+test_bench_key_proc_LDADD = $(TESTS_LDADD)
@BUILD_LINUX_TESTS_TRUE@test_state_LDADD = $(TESTS_LDADD)
@BUILD_LINUX_TESTS_TRUE@test_keyseq_LDADD = $(TESTS_LDADD)
-@BUILD_LINUX_TESTS_TRUE@test_rulescomp_LDADD = $(TESTS_LDADD) -lrt
+@BUILD_LINUX_TESTS_TRUE@test_rulescomp_LDADD = $(TESTS_LDADD)
@BUILD_LINUX_TESTS_TRUE@test_interactive_evdev_LDADD = $(TESTS_LDADD)
@ENABLE_X11_TRUE@TESTS_X11_LDADD = $(XCB_XKB_LIBS) $(TESTS_LDADD) libxkbcommon-x11.la
@ENABLE_X11_TRUE@TESTS_X11_CFLAGS = $(XCB_XKB_CFLAGS)
@@ -2454,8 +2454,6 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-local
uninstall-xkbcommonincludeHEADERS

16
x11/xkbcommon/patches/patch-test_x11comp_c Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-test_x11comp_c,v 1.1 2014/10/15 18:24:15 jasper Exp $
Remove uncondintionally included linux/input.h,
which isn't even required on Linux. Based on upstream
commit e95fb475ebd203b030f17ddf9c55e487d3c929a0
--- test/x11comp.c.orig Wed Oct 15 20:02:06 2014
+++ test/x11comp.c Wed Oct 15 20:08:27 2014
@@ -28,7 +28,6 @@
#include <signal.h>
#include <sys/types.h>
#include <sys/wait.h>
-#include <linux/input.h>
#include "test.h"
#include "xkbcommon/xkbcommon-x11.h"