Merge #55: Fix miekg/dns v1.1.16

5816296 Add goxcrypto/goxnet/goxsys dependencies to miekg/dns (JeremyRand)
7468493 Add goxsys/unix (JeremyRand)
cf288bf Add goxnet/ip (JeremyRand)
09ef394 Add goxcrypto/ed25519 (JeremyRand)
62efef1 Add goxcrypto from upstream tor-browser-build (JeremyRand)
f79095c Add clang project from upstream tor-browser-build (JeremyRand)

Pull request description:

  This PR fixes various build errors affecting miekg/dns v1.1.16 (introduced by the upstream dependency bump in https://github.com/namecoin/ncdns-repro/pull/54 ).
pull/56/head
JeremyRand 5 years ago
commit ce9b202736
No known key found for this signature in database
GPG Key ID: B3F2D165786D6570

@ -0,0 +1 @@
../tor-browser-build/keyring/clang.gpg

@ -0,0 +1 @@
../tor-browser-build/projects/clang

@ -9,9 +9,26 @@ var:
container:
use_container: 1
go_lib: github.com/miekg/dns
go_lib_deps: []
go_lib_deps:
- golang.org,x,crypto,ed25519
- golang.org,x,net,ip
- golang.org,x,sys,unix
targets:
windows:
var:
go_lib_deps:
- golang.org,x,crypto,ed25519
input_files:
- project: container-image
- name: go
project: go
- name: golang.org,x,crypto,ed25519
project: golang.org,x,crypto,ed25519
- name: golang.org,x,net,ip
project: golang.org,x,net,ip
enable: '[% ! c("var/windows") %]'
- name: golang.org,x,sys,unix
project: golang.org,x,sys,unix
enable: '[% ! c("var/windows") %]'

@ -0,0 +1 @@
../tor-browser-build/projects/goxcrypto

@ -0,0 +1,19 @@
# vim: filetype=yaml sw=2
version: '[% c("abbrev") %]'
git_url: '[% pc("golang.org,x,crypto", "git_url") %]'
git_hash: '[% pc("golang.org,x,crypto", "git_hash") %]'
filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
build: '[% c("projects/go/var/build_go_lib") %]'
var:
container:
use_container: 1
go_lib: golang.org/x/crypto
go_lib_install:
- golang.org/x/crypto/ed25519
input_files:
- project: container-image
- name: go
project: go

@ -0,0 +1,20 @@
# vim: filetype=yaml sw=2
version: '[% c("abbrev") %]'
git_url: '[% pc("golang.org,x,net", "git_url") %]'
git_hash: '[% pc("golang.org,x,net", "git_hash") %]'
filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
build: '[% c("projects/go/var/build_go_lib") %]'
var:
container:
use_container: 1
go_lib: golang.org/x/net
go_lib_install:
- golang.org/x/net/ipv4
- golang.org/x/net/ipv6
input_files:
- project: container-image
- name: go
project: go

@ -0,0 +1,19 @@
# vim: filetype=yaml sw=2
version: '[% c("abbrev") %]'
git_url: '[% pc("golang.org,x,sys", "git_url") %]'
git_hash: '[% pc("golang.org,x,sys", "git_hash") %]'
filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
build: '[% c("projects/go/var/build_go_lib") %]'
var:
container:
use_container: 1
go_lib: golang.org/x/sys
go_lib_install:
- golang.org/x/sys/unix
input_files:
- project: container-image
- name: go
project: go
Loading…
Cancel
Save