joejulian/gio-patched
1
0
Fork 0
forked from joejulian/gio
Code Pull Requests 1 Activity

app: Enable building on OpenBSD

Browse Source 
Currently the golang.org/x/sys package is missing the Pipe2 call for OpenBSD.
The call exists on OpenBSD, it just isn't exposed.

This diff was tested buy adding the Pipe2 call and setting:

   go mod edit -replace=golang.org/x/sys=/pat/to/modified/sys

Signed-off-by: Aaron Bieber <aaron@bolddaemon.com>
This commit is contained in:
Aaron Bieber
2020-01-23 13:54:26 -07:00
committed by Elias Naur
parent 18cddc0300
commit fdaf891732
8 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/headless/headless_egl.go
+1 -1
View File
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: Unlicense OR MIT
// +build linux freebsd windows
// +build linux freebsd windows openbsd
package headless
app/internal/egl/egl.go
+1 -1
View File
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: Unlicense OR MIT
// +build linux windows freebsd
// +build linux windows freebsd openbsd
package egl
app/internal/egl/egl_unix.go
+3 -1
View File
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: Unlicense OR MIT
// +build linux freebsd
// +build linux freebsd openbsd
package egl
@@ -8,6 +8,8 @@ package egl
#cgo LDFLAGS: -lEGL
#cgo freebsd CFLAGS: -I/usr/local/include
#cgo freebsd LDFLAGS: -L/usr/local/lib
#cgo openbsd CFLAGS: -I/usr/X11R6/include
#cgo openbsd LDFLAGS: -L/usr/X11R6/lib
#include <EGL/egl.h>
#include <EGL/eglext.h>
app/internal/gl/functions.go
+5 -2
View File
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: Unlicense OR MIT
// +build darwin linux freebsd
// +build darwin linux freebsd openbsd
package gl
@@ -12,9 +12,12 @@ import (
/*
#cgo CFLAGS: -Werror
#cgo linux freebsd LDFLAGS: -lGLESv2 -ldl
#cgo linux freebsd openbsd LDFLAGS: -lGLESv2
#cgo linux freebsd LDFLAGS: -ldl
#cgo freebsd CFLAGS: -I/usr/local/include
#cgo freebsd LDFLAGS: -L/usr/local/lib
#cgo openbsd CFLAGS: -I/usr/X11R6/include
#cgo openbsd LDFLAGS: -L/usr/X11R6/lib
#cgo darwin,!ios CFLAGS: -DGL_SILENCE_DEPRECATION
#cgo darwin,!ios LDFLAGS: -framework OpenGL
#cgo darwin,ios CFLAGS: -DGLES_SILENCE_DEPRECATION
app/internal/window/egl_x11.go
+1 -1
View File
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: Unlicense OR MIT
// +build linux,!android,!nox11 freebsd
// +build linux,!android,!nox11 freebsd openbsd
package window
app/internal/window/os_unix.go
+1 -1
View File
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: Unlicense OR MIT
// +build linux,!android freebsd
// +build linux,!android freebsd openbsd
package window
app/internal/window/os_x11.go
+3 -1
View File
@@ -1,10 +1,12 @@
// SPDX-License-Identifier: Unlicense OR MIT
// +build linux,!android,!nox11 freebsd
// +build linux,!android,!nox11 freebsd openbsd
package window
/*
#cgo openbsd CFLAGS: -I/usr/X11R6/include -I/usr/local/include
#cgo openbsd LDFLAGS: -L/usr/X11R6/lib -L/usr/local/lib
#cgo LDFLAGS: -lX11 -lxkbcommon -lxkbcommon-x11 -lX11-xcb
#include <stdlib.h>
#include <locale.h>
app/internal/xkb/xkb_unix.go
+3 -3
View File
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: Unlicense OR MIT
// +build linux,!android freebsd
// +build linux,!android freebsd openbsd
// Package xkb implements a Go interface for the X Keyboard Extension library.
package xkb
@@ -20,8 +20,8 @@ import (
/*
#cgo LDFLAGS: -lxkbcommon
#cgo freebsd CFLAGS: -I/usr/local/include
#cgo freebsd LDFLAGS: -L/usr/local/lib
#cgo freebsd openbsd CFLAGS: -I/usr/local/include
#cgo freebsd openbsd LDFLAGS: -L/usr/local/lib
#include <stdlib.h>
#include <xkbcommon/xkbcommon.h>