commit 90d65bdd8e311d0114e3347270e70ed007e409f5 Author: Georg Koppen <gk@torproject.org> Date: Mon Jul 5 08:43:52 2021 +0000 Bug 40323: Remove unused gomobile project --- ...BILE_TMPDIR-env-variable-is-defined-use-t.patch | 35 ---------------------- projects/gomobile/config | 33 -------------------- projects/goxexp/config | 19 ------------ projects/goximage/config | 28 ----------------- 4 files changed, 115 deletions(-) diff --git a/projects/gomobile/0001-If-the-GOMOBILE_TMPDIR-env-variable-is-defined-use-t.patch b/projects/gomobile/0001-If-the-GOMOBILE_TMPDIR-env-variable-is-defined-use-t.patch deleted file mode 100644 index 770b22a..0000000 --- a/projects/gomobile/0001-If-the-GOMOBILE_TMPDIR-env-variable-is-defined-use-t.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 188307b6acd5003e82cb68872da9463f5f707515 Mon Sep 17 00:00:00 2001 -From: Nicolas Vigier <boklm@torproject.org> -Date: Thu, 27 Jun 2019 12:46:38 +0200 -Subject: [PATCH] If the GOMOBILE_TMPDIR env variable is defined, use that as - tmpdir - -Having the option to select a fixed tmpdir makes it possible to have -reproducible builds, as the build directory is embedded in the generated -executables. ---- - cmd/gomobile/env.go | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/cmd/gomobile/env.go b/cmd/gomobile/env.go -index 471b009..b97141b 100644 ---- a/cmd/gomobile/env.go -+++ b/cmd/gomobile/env.go -@@ -61,9 +61,14 @@ func buildEnvInit() (cleanup func(), err error) { - tmpdir = "$WORK" - cleanupFn = func() {} - } else { -- tmpdir, err = ioutil.TempDir("", "gomobile-work-") -- if err != nil { -- return nil, err -+ gomobile_tmpdir := os.Getenv("GOMOBILE_TMPDIR") -+ if gomobile_tmpdir != "" { -+ tmpdir = gomobile_tmpdir -+ } else { -+ tmpdir, err = ioutil.TempDir("", "gomobile-work-") -+ if err != nil { -+ return nil, err -+ } - } - } - if buildX { diff --git a/projects/gomobile/config b/projects/gomobile/config deleted file mode 100644 index 9dbfc29..0000000 --- a/projects/gomobile/config +++ /dev/null @@ -1,33 +0,0 @@ -# vim: filetype=yaml sw=2 -version: '[% c("abbrev") %]' -git_url: https://github.com/golang/mobile -git_hash: 92f3b9caf7ba8f4f9c10074225afcba0cba47a62 -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 - no_crosscompile: 1 - go_lib: golang.org/x/mobile - go_lib_deps: - - goximage - - goxexp - go_lib_install: - - golang.org/x/mobile/cmd/gobind - - golang.org/x/mobile/cmd/gomobile - build_go_lib_pre: | - [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] - -input_files: - - project: container-image - - name: go - project: go - - name: goximage - project: goximage - - name: goxexp - project: goxexp - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' - - filename: 0001-If-the-GOMOBILE_TMPDIR-env-variable-is-defined-use-t.patch diff --git a/projects/goxexp/config b/projects/goxexp/config deleted file mode 100644 index c81a65f..0000000 --- a/projects/goxexp/config +++ /dev/null @@ -1,19 +0,0 @@ -# vim: filetype=yaml sw=2 -version: '[% c("abbrev") %]' -git_url: https://github.com/golang/exp -git_hash: a1d7652674e8f269b17d9be90d3c4c1d0e8830e8 -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 - no_crosscompile: 1 - go_lib: golang.org/x/exp - go_lib_install: [] - -input_files: - - project: container-image - - name: go - project: go diff --git a/projects/goximage/config b/projects/goximage/config deleted file mode 100644 index 308a1ba..0000000 --- a/projects/goximage/config +++ /dev/null @@ -1,28 +0,0 @@ -# vim: filetype=yaml sw=2 -version: '[% c("abbrev") %]' -git_url: https://github.com/golang/image -git_hash: 0694c2d4d067f97ebef574d63a763ee8ab559da7 -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 - no_crosscompile: 1 - go_lib: golang.org/x/image - go_lib_install: - - golang.org/x/image/webp - - golang.org/x/image/bmp - - golang.org/x/image/draw - - golang.org/x/image/font - - golang.org/x/image/math/fixed - - golang.org/x/image/math/f32 - - golang.org/x/image/math/f64 - - golang.org/x/image/vp8 - - golang.org/x/image/vp8l - -input_files: - - project: container-image - - name: go - project: go