From 1e775bf59b1d28653b8ee7cda7496f176c476274 Mon Sep 17 00:00:00 2001 From: Steven Wolfe Date: Mon, 14 Jan 2019 12:38:11 -0700 Subject: [PATCH] Adding ARM and ARM64 packages --- Gopkg.lock | 11 ++++++----- build.sh | 2 ++ .../tidwall/evio/internal/internal_linux.go | 2 +- vendor/github.com/tidwall/geojson/geometry/series.go | 4 ++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index e207c9d9..78fc8ab8 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -231,19 +231,19 @@ revision = "b67b1b8c1658cb01502801c14e33c61e6c4cbb95" [[projects]] - digest = "1:1f7026c4840ae2a06e892ffcad5a36416de0a7e5be33ce65449435fd8f15414b" + digest = "1:91acf4d86b348c1f1832336836035373b047ffcb16a0fde066bd531bbe3452b2" name = "github.com/tidwall/evio" packages = [ ".", "internal", ] pruneopts = "" - revision = "ea610eff86981249be649bbdcedbf409a2db2173" - version = "v1.0.1" + revision = "b353be3a765785dafabbb63a7b25aadec3533946" + version = "v1.0.2" [[projects]] branch = "master" - digest = "1:24cb019229d3a4d0febd3934800b3759df35c722e93d63d9cfe32015d7abfec3" + digest = "1:0a6da4a08925415ab3326e140985ec628417903637461e9b68c07a03dfcc918d" name = "github.com/tidwall/geojson" packages = [ ".", @@ -251,7 +251,7 @@ "geometry", ] pruneopts = "" - revision = "ade1bcf7b6db0e5ffb0605fea152254d2c002d6a" + revision = "d0a98d02b48e887b4de454d80c61ef5fb9312482" [[projects]] digest = "1:3ddca2bd5496c6922a2a9e636530e178a43c2a534ea6634211acdc7d10222794" @@ -472,6 +472,7 @@ "github.com/tidwall/gjson", "github.com/tidwall/lotsa", "github.com/tidwall/match", + "github.com/tidwall/pretty", "github.com/tidwall/redbench", "github.com/tidwall/redcon", "github.com/tidwall/resp", diff --git a/build.sh b/build.sh index d2d12f21..0e0355a2 100755 --- a/build.sh +++ b/build.sh @@ -142,6 +142,8 @@ if [ "$1" == "package" ]; then package "Mac" "darwin" "amd64" package "Linux" "linux" "amd64" package "FreeBSD" "freebsd" "amd64" + package "ARM" "linux" "arm" + package "ARM64" "linux" "arm64" exit fi diff --git a/vendor/github.com/tidwall/evio/internal/internal_linux.go b/vendor/github.com/tidwall/evio/internal/internal_linux.go index 2b438885..6bbaffa4 100644 --- a/vendor/github.com/tidwall/evio/internal/internal_linux.go +++ b/vendor/github.com/tidwall/evio/internal/internal_linux.go @@ -23,7 +23,7 @@ func OpenPoll() *Poll { panic(err) } l.fd = p - r0, _, e0 := syscall.Syscall(syscall.SYS_EVENTFD, 0, 0, 0) + r0, _, e0 := syscall.Syscall(syscall.SYS_EVENTFD2, 0, 0, 0) if e0 != 0 { syscall.Close(p) panic(err) diff --git a/vendor/github.com/tidwall/geojson/geometry/series.go b/vendor/github.com/tidwall/geojson/geometry/series.go index dddbf1a7..2b9e1c1c 100644 --- a/vendor/github.com/tidwall/geojson/geometry/series.go +++ b/vendor/github.com/tidwall/geojson/geometry/series.go @@ -191,8 +191,8 @@ func (series *baseSeries) Search( // convert the byte pointer back to a valid slice data := *(*[]byte)(unsafe.Pointer(&reflect.SliceHeader{ Data: uintptr(unsafe.Pointer(v)), - Len: 0xFFFFFFFF, - Cap: 0xFFFFFFFF, + Len: int((^uint(0)) >> 1), + Cap: int((^uint(0)) >> 1), })) n := binary.LittleEndian.Uint32(data[1:]) data = data[:n:n]