Browse Source

geo: remove geoproj dependency for now

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
pull/49757/head
Oliver Tan 1 month ago
parent
commit
58d5b23806
3 changed files with 0 additions and 5 deletions
  1. +0
    -2
      Makefile
  2. +0
    -1
      pkg/geo/geo.go
  3. +0
    -2
      pkg/geo/geogfn/geogfn.go

+ 0
- 2
Makefile View File

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


+ 0
- 1
pkg/geo/geo.go View File

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


+ 0
- 2
pkg/geo/geogfn/geogfn.go View File

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


Loading…
Cancel
Save