status-im
/
op-geth
mirror of https://github.com/status-im/op-geth.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19681 from karalabe/fix-libusb-docker 

vendor: pull in USB fix for docker (alpine/musl)
This commit is contained in:
Péter Szilágyi 2019-06-07 12:37:32 +03:00 committed by GitHub
parent 19fa9064d7 9805288cdd
commit ce43c2366d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vendor/github.com/karalabe/usb/Dockerfile.alpine generated vendored Normal file
View File

@ -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

4
vendor/github.com/karalabe/usb/Dockerfile.ubuntu generated vendored Normal file
View File

@ -0,0 +1,4 @@
FROM golang:latest
ADD . $GOPATH/src/github.com/karalabe/usb
RUN cd $GOPATH/src/github.com/karalabe/usb && go install

2
vendor/github.com/karalabe/usb/libs.go generated vendored
View File

@ -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

6
vendor/vendor.json vendored
View File

@ -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
},
{