Skip to content

Commit 76e176e

Browse files
authoredOct 23, 2024··
let go-libedit build its own libedit (#15)
1 parent 5f6afbd commit 76e176e

File tree

4 files changed

+3
-42
lines changed

4 files changed

+3
-42
lines changed
 

‎Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,6 @@ vendor/github.com/knz/go-libedit/unix/zcgo_flags_extra.go: Makefile vendor/modul
518518
@echo >> $@
519519
@echo 'package $($(@D)-package)' >> $@
520520
@echo >> $@
521-
@echo '// #cgo CPPFLAGS: -DGO_LIBEDIT_NO_BUILD' >> $@
522521
@echo '// #cgo !windows LDFLAGS: -ledit -lncurses' >> $@
523522
@echo 'import "C"' >> $@
524523

‎go.mod

+1-3
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ require (
9696
github.com/kevinburke/go-bindata v3.13.0+incompatible
9797
github.com/kisielk/errcheck v1.6.1-0.20210625163953-8ddee489636a
9898
github.com/kisielk/gotool v1.0.0
99-
github.com/knz/go-libedit v1.10.1
99+
github.com/knz/go-libedit v1.10.2-0.20230308122845-657a11e944a9
100100
github.com/knz/strtime v0.0.0-20200318182718-be999391ffa9
101101
github.com/kr/pretty v0.3.0
102102
github.com/kr/text v0.2.0
@@ -344,8 +344,6 @@ replace vitess.io/vitess => github.com/cockroachdb/vitess v0.0.0-20210218160543-
344344

345345
replace gopkg.in/yaml.v2 => github.com/cockroachdb/yaml v0.0.0-20210825132133-2d6955c8edbc
346346

347-
replace github.com/knz/go-libedit => github.com/otan-cockroach/go-libedit v1.10.2-0.20201030151939-7cced08450e7
348-
349347
// At the time of writing (i.e. as of this version below) the `etcd` repo is in the process of properly introducing
350348
// modules, and as part of that uses an unsatisfiable version for this dependency (v3.0.0-00010101000000-000000000000).
351349
// We just force it to the same SHA as the `go.etcd.io/etcd/raft/v3` module (they live in the same VCS root).

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -1432,6 +1432,8 @@ github.com/klauspost/pgzip v1.0.2-0.20170402124221-0bf5dcad4ada/go.mod h1:Ch1tH6
14321432
github.com/klauspost/pgzip v1.2.4/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
14331433
github.com/klauspost/pgzip v1.2.5 h1:qnWYvvKqedOF2ulHpMG72XQol4ILEJ8k2wwRl/Km8oE=
14341434
github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
1435+
github.com/knz/go-libedit v1.10.2-0.20230308122845-657a11e944a9 h1:LkGI7do6fSw3Kmp3kKLk+hH7/Xor8uk9IcVBS/y4DpQ=
1436+
github.com/knz/go-libedit v1.10.2-0.20230308122845-657a11e944a9/go.mod h1:dmDChGdWopkB61HsdDN0/fxKAMIYljKTu+AG9uc4qVY=
14351437
github.com/knz/strtime v0.0.0-20200318182718-be999391ffa9 h1:GQE1iatYDRrIidq4Zf/9ZzKWyrTk2sXOYc1JADbkAjQ=
14361438
github.com/knz/strtime v0.0.0-20200318182718-be999391ffa9/go.mod h1:4ZxfWkxwtc7dBeifERVVWRy9F9rTU9p0yCDgeCtlius=
14371439
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -1728,8 +1730,6 @@ github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnh
17281730
github.com/openzipkin/zipkin-go v0.2.5 h1:UwtQQx2pyPIgWYHRg+epgdx1/HnBQTgN3/oIYEJTQzU=
17291731
github.com/openzipkin/zipkin-go v0.2.5/go.mod h1:KpXfKdgRDnnhsxw4pNIH9Md5lyFqKUa4YDFlwRYAMyE=
17301732
github.com/ory/dockertest/v3 v3.6.0/go.mod h1:4ZOpj8qBUmh8fcBSVzkH2bws2s91JdGvHUqan4GHEuQ=
1731-
github.com/otan-cockroach/go-libedit v1.10.2-0.20201030151939-7cced08450e7 h1:+sIdymRXD4aKCvmVMBLL7/bO95KZFYrbz0EzQ1Jlj4A=
1732-
github.com/otan-cockroach/go-libedit v1.10.2-0.20201030151939-7cced08450e7/go.mod h1:X8+oa2glxe4aJyviH7x8FG5AoSdqZ0VJYOxt83gh6m8=
17331733
github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c/go.mod h1:X07ZCGwUbLaax7L0S3Tw4hpejzu63ZrrQiUe6W0hcy0=
17341734
github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM=
17351735
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=

‎patches/go-libedit.patch

-36
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.