April 2021 - tor-commits - lists.torproject.org

[tor/maint-0.4.5] scripts/build/combine_libs: use $AR rather than ar
by nickm＠torproject.org 19 Apr '21

19 Apr '21

commit f47c6c3d1b38a7770da007f904925a50cf687906 Author: Emery Hemingway <ehmry(a)posteo.net> Date: Fri Apr 16 15:17:43 2021 +0200 scripts/build/combine_libs: use $AR rather than ar Using a custom ar at $AR may be necessary for cross-compilation. Closes #40369 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40369 | 2 ++ scripts/build/combine_libs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/changes/ticket40369 b/changes/ticket40369 new file mode 100644 index 0000000000..b08088c97b --- /dev/null +++ b/changes/ticket40369 @@ -0,0 +1,2 @@ + o Minor feature (build, cross-compilation): + - Allow a custom ar for cross-compilation purposes. Closes ticket 40369. diff --git a/scripts/build/combine_libs b/scripts/build/combine_libs index fb311552fe..9c87f68248 100755 --- a/scripts/build/combine_libs +++ b/scripts/build/combine_libs @@ -25,7 +25,7 @@ for input in "$@"; do dir="$TMPDIR"/$(basename "$input" .a) mkdir "$dir" cd "$dir">/dev/null - ar x "$abs" + "${AR:-ar}" x "$abs" done cd "$TMPDIR" >/dev/null

1 0

[tor/maint-0.4.5] Tweak changes/ticket40369 to be a bug.
by nickm＠torproject.org 19 Apr '21

19 Apr '21

commit cd75eac743723fca44edb650af7616393b1054ed Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 19 11:29:46 2021 -0400 Tweak changes/ticket40369 to be a bug. --- changes/ticket40369 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/changes/ticket40369 b/changes/ticket40369 index b08088c97b..abb59a7125 100644 --- a/changes/ticket40369 +++ b/changes/ticket40369 @@ -1,2 +1,4 @@ - o Minor feature (build, cross-compilation): - - Allow a custom ar for cross-compilation purposes. Closes ticket 40369. + o Minor bugfixes (build, cross-compilation): + - Allow a custom "ar" for cross-compilation. Our previous build script + had used the $AR environment variable in most places, but it missed + one. Fixes bug 40369; bugfix on 0.4.5.1-alpha.

1 0

[tor/maint-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
by nickm＠torproject.org 19 Apr '21

19 Apr '21

commit d162b98548934f575123ca9bff45b85a9eb2bdf5 Merge: 461a3c732b cd75eac743 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 19 11:30:00 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 changes/ticket40369 | 4 ++++ scripts/build/combine_libs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.6] scripts/build/combine_libs: use $AR rather than ar
by nickm＠torproject.org 19 Apr '21

19 Apr '21

commit f47c6c3d1b38a7770da007f904925a50cf687906 Author: Emery Hemingway <ehmry(a)posteo.net> Date: Fri Apr 16 15:17:43 2021 +0200 scripts/build/combine_libs: use $AR rather than ar Using a custom ar at $AR may be necessary for cross-compilation. Closes #40369 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40369 | 2 ++ scripts/build/combine_libs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/changes/ticket40369 b/changes/ticket40369 new file mode 100644 index 0000000000..b08088c97b --- /dev/null +++ b/changes/ticket40369 @@ -0,0 +1,2 @@ + o Minor feature (build, cross-compilation): + - Allow a custom ar for cross-compilation purposes. Closes ticket 40369. diff --git a/scripts/build/combine_libs b/scripts/build/combine_libs index fb311552fe..9c87f68248 100755 --- a/scripts/build/combine_libs +++ b/scripts/build/combine_libs @@ -25,7 +25,7 @@ for input in "$@"; do dir="$TMPDIR"/$(basename "$input" .a) mkdir "$dir" cd "$dir">/dev/null - ar x "$abs" + "${AR:-ar}" x "$abs" done cd "$TMPDIR" >/dev/null

1 0

[tor/maint-0.4.6] Tweak changes/ticket40369 to be a bug.
by nickm＠torproject.org 19 Apr '21

19 Apr '21

commit cd75eac743723fca44edb650af7616393b1054ed Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 19 11:29:46 2021 -0400 Tweak changes/ticket40369 to be a bug. --- changes/ticket40369 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/changes/ticket40369 b/changes/ticket40369 index b08088c97b..abb59a7125 100644 --- a/changes/ticket40369 +++ b/changes/ticket40369 @@ -1,2 +1,4 @@ - o Minor feature (build, cross-compilation): - - Allow a custom ar for cross-compilation purposes. Closes ticket 40369. + o Minor bugfixes (build, cross-compilation): + - Allow a custom "ar" for cross-compilation. Our previous build script + had used the $AR environment variable in most places, but it missed + one. Fixes bug 40369; bugfix on 0.4.5.1-alpha.

1 0

[tor/master] Tweak changes/ticket40369 to be a bug.
by nickm＠torproject.org 19 Apr '21

19 Apr '21

commit cd75eac743723fca44edb650af7616393b1054ed Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 19 11:29:46 2021 -0400 Tweak changes/ticket40369 to be a bug. --- changes/ticket40369 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/changes/ticket40369 b/changes/ticket40369 index b08088c97b..abb59a7125 100644 --- a/changes/ticket40369 +++ b/changes/ticket40369 @@ -1,2 +1,4 @@ - o Minor feature (build, cross-compilation): - - Allow a custom ar for cross-compilation purposes. Closes ticket 40369. + o Minor bugfixes (build, cross-compilation): + - Allow a custom "ar" for cross-compilation. Our previous build script + had used the $AR environment variable in most places, but it missed + one. Fixes bug 40369; bugfix on 0.4.5.1-alpha.

1 0

[tor/master] scripts/build/combine_libs: use $AR rather than ar
by nickm＠torproject.org 19 Apr '21

19 Apr '21

commit f47c6c3d1b38a7770da007f904925a50cf687906 Author: Emery Hemingway <ehmry(a)posteo.net> Date: Fri Apr 16 15:17:43 2021 +0200 scripts/build/combine_libs: use $AR rather than ar Using a custom ar at $AR may be necessary for cross-compilation. Closes #40369 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40369 | 2 ++ scripts/build/combine_libs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/changes/ticket40369 b/changes/ticket40369 new file mode 100644 index 0000000000..b08088c97b --- /dev/null +++ b/changes/ticket40369 @@ -0,0 +1,2 @@ + o Minor feature (build, cross-compilation): + - Allow a custom ar for cross-compilation purposes. Closes ticket 40369. diff --git a/scripts/build/combine_libs b/scripts/build/combine_libs index fb311552fe..9c87f68248 100755 --- a/scripts/build/combine_libs +++ b/scripts/build/combine_libs @@ -25,7 +25,7 @@ for input in "$@"; do dir="$TMPDIR"/$(basename "$input" .a) mkdir "$dir" cd "$dir">/dev/null - ar x "$abs" + "${AR:-ar}" x "$abs" done cd "$TMPDIR" >/dev/null

1 0

[tor/master] Merge branch 'maint-0.4.6'
by nickm＠torproject.org 19 Apr '21

19 Apr '21

commit de33be6e32ad9d7eef40de826b8083905293fd96 Merge: 7080e748e5 d162b98548 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 19 11:30:00 2021 -0400 Merge branch 'maint-0.4.6' changes/ticket40369 | 4 ++++ scripts/build/combine_libs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.4.5' into maint-0.4.6
by nickm＠torproject.org 19 Apr '21

19 Apr '21

commit d162b98548934f575123ca9bff45b85a9eb2bdf5 Merge: 461a3c732b cd75eac743 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 19 11:30:00 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 changes/ticket40369 | 4 ++++ scripts/build/combine_libs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.5] scripts/build/combine_libs: use $AR rather than ar
by nickm＠torproject.org 19 Apr '21

19 Apr '21

commit f47c6c3d1b38a7770da007f904925a50cf687906 Author: Emery Hemingway <ehmry(a)posteo.net> Date: Fri Apr 16 15:17:43 2021 +0200 scripts/build/combine_libs: use $AR rather than ar Using a custom ar at $AR may be necessary for cross-compilation. Closes #40369 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40369 | 2 ++ scripts/build/combine_libs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/changes/ticket40369 b/changes/ticket40369 new file mode 100644 index 0000000000..b08088c97b --- /dev/null +++ b/changes/ticket40369 @@ -0,0 +1,2 @@ + o Minor feature (build, cross-compilation): + - Allow a custom ar for cross-compilation purposes. Closes ticket 40369. diff --git a/scripts/build/combine_libs b/scripts/build/combine_libs index fb311552fe..9c87f68248 100755 --- a/scripts/build/combine_libs +++ b/scripts/build/combine_libs @@ -25,7 +25,7 @@ for input in "$@"; do dir="$TMPDIR"/$(basename "$input" .a) mkdir "$dir" cd "$dir">/dev/null - ar x "$abs" + "${AR:-ar}" x "$abs" done cd "$TMPDIR" >/dev/null

1 0