Skip to content

Commit

Permalink
geo: remove geoproj dependency for now
Browse files Browse the repository at this point in the history
Seems to be breaking Upload Binaries (not sure why) because execgen
depends on geo. The dependencies should make it work (not sure why it
doesn't), but it doesn't seem important to solve this atm.

Release note: None
  • Loading branch information
otan committed Jun 1, 2020
1 parent 95916e4 commit 58d5b23
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 5 deletions.
2 changes: 0 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -1541,8 +1541,6 @@ bin/execgen_out.d: bin/execgen
@echo EXECGEN $@; execgen -M $(EXECGEN_TARGETS) >$@.tmp || { rm -f $@.tmp; exit 1; }
@mv -f $@.tmp $@

bin/execgen: $(LIBPROJ) $(CGO_FLAGS_FILES)

# No need to pull all the world in when a user just wants
# to know how to invoke `make` or clean up.
ifneq ($(build-with-dep-files),)
Expand Down
1 change: 0 additions & 1 deletion pkg/geo/geo.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import (
"encoding/binary"

"github.com/cockroachdb/cockroach/pkg/geo/geopb"
_ "github.com/cockroachdb/cockroach/pkg/geo/geoproj" // blank import to make sure PROJ compiles
"github.com/cockroachdb/errors"
"github.com/golang/geo/s2"
"github.com/twpayne/go-geom"
Expand Down
2 changes: 0 additions & 2 deletions pkg/geo/geogfn/geogfn.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@

package geogfn

import _ "github.com/cockroachdb/cockroach/pkg/geo/geoproj" // blank import to make sure PROJ compiles

// UseSphereOrSpheroid indicates whether to use a Sphere or Spheroid
// for certain calculations.
type UseSphereOrSpheroid bool
Expand Down

0 comments on commit 58d5b23

Please sign in to comment.