diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2019-06-07 17:37:32 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-07 17:37:32 +0800 |
| commit | ce43c2366d5ad06c9a863c9b5003f285951650cb (patch) | |
| tree | b0a688e4b979f8aebbfbd534371f0897cd320cfd | |
| parent | 19fa9064d713369796da01ed3299a9b8f5a58401 (diff) | |
| parent | 9805288cdd852f6de70b27451a2df320d071af28 (diff) | |
| download | go-tangerine-ce43c2366d5ad06c9a863c9b5003f285951650cb.tar go-tangerine-ce43c2366d5ad06c9a863c9b5003f285951650cb.tar.gz go-tangerine-ce43c2366d5ad06c9a863c9b5003f285951650cb.tar.bz2 go-tangerine-ce43c2366d5ad06c9a863c9b5003f285951650cb.tar.lz go-tangerine-ce43c2366d5ad06c9a863c9b5003f285951650cb.tar.xz go-tangerine-ce43c2366d5ad06c9a863c9b5003f285951650cb.tar.zst go-tangerine-ce43c2366d5ad06c9a863c9b5003f285951650cb.zip | |
Merge pull request #19681 from karalabe/fix-libusb-docker
vendor: pull in USB fix for docker (alpine/musl)
| -rw-r--r-- | vendor/github.com/karalabe/usb/Dockerfile.alpine | 6 | ||||
| -rw-r--r-- | vendor/github.com/karalabe/usb/Dockerfile.ubuntu | 4 | ||||
| -rw-r--r-- | vendor/github.com/karalabe/usb/libs.go | 2 | ||||
| -rw-r--r-- | vendor/vendor.json | 6 |
4 files changed, 14 insertions, 4 deletions
diff --git a/vendor/github.com/karalabe/usb/Dockerfile.alpine b/vendor/github.com/karalabe/usb/Dockerfile.alpine new file mode 100644 index 000000000..342bdf79a --- /dev/null +++ b/vendor/github.com/karalabe/usb/Dockerfile.alpine @@ -0,0 +1,6 @@ +FROM golang:alpine + +RUN apk add --no-cache git gcc musl-dev linux-headers + +ADD . $GOPATH/src/github.com/karalabe/usb +RUN cd $GOPATH/src/github.com/karalabe/usb && go install diff --git a/vendor/github.com/karalabe/usb/Dockerfile.ubuntu b/vendor/github.com/karalabe/usb/Dockerfile.ubuntu new file mode 100644 index 000000000..b861e497b --- /dev/null +++ b/vendor/github.com/karalabe/usb/Dockerfile.ubuntu @@ -0,0 +1,4 @@ +FROM golang:latest + +ADD . $GOPATH/src/github.com/karalabe/usb +RUN cd $GOPATH/src/github.com/karalabe/usb && go install diff --git a/vendor/github.com/karalabe/usb/libs.go b/vendor/github.com/karalabe/usb/libs.go index 94720fbd4..6446acee9 100644 --- a/vendor/github.com/karalabe/usb/libs.go +++ b/vendor/github.com/karalabe/usb/libs.go @@ -23,7 +23,7 @@ package usb #cgo CFLAGS: -DDEFAULT_VISIBILITY="" #cgo CFLAGS: -DPOLL_NFDS_TYPE=int -#cgo linux CFLAGS: -DOS_LINUX -D_GNU_SOURCE +#cgo linux CFLAGS: -DOS_LINUX -D_GNU_SOURCE -DHAVE_SYS_TIME_H #cgo linux,!android LDFLAGS: -lrt #cgo darwin CFLAGS: -DOS_DARWIN -DHAVE_SYS_TIME_H #cgo darwin LDFLAGS: -framework CoreFoundation -framework IOKit -lobjc diff --git a/vendor/vendor.json b/vendor/vendor.json index 946508a33..94f4742e6 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -267,10 +267,10 @@ "revisionTime": "2017-04-30T22:20:11Z" }, { - "checksumSHA1": "0ixnoiChdbeva2xNe3z/vYzqcL4=", + "checksumSHA1": "wqKuSmlxa4hVZwfs4ZjtKtM5Yp0=", "path": "github.com/karalabe/usb", - "revision": "0efdeddd92369dc00d4fb1b9cd56a442bdb61f82", - "revisionTime": "2019-06-06T09:23:27Z", + "revision": "3eff4807c21acef1c5f1b712a225ab09a8961504", + "revisionTime": "2019-06-07T09:24:32Z", "tree": true }, { |