This is an automated email from the git hooks/post-receive script.

richard pushed a commit to branch maint-11.0 in repository builders/tor-browser-build.

The following commit(s) were added to refs/heads/maint-11.0 by this push: new 1878b8f Bug 40470: Fix zlib build issue for android 1878b8f is described below

commit 1878b8fc06f3aa1771d23eceb191551be0ce8016 Author: Nicolas Vigier boklm@torproject.org AuthorDate: Mon Apr 4 11:14:25 2022 +0200

Bug 40470: Fix zlib build issue for android

https://github.com/madler/zlib/issues/608 --- ...re-issue-that-discarded-provided-CC-defin.patch | 24 ++++++++++++++++++++++ projects/zlib/build | 4 ++++ projects/zlib/config | 1 + 3 files changed, 29 insertions(+)

diff --git a/projects/zlib/0001-Fix-configure-issue-that-discarded-provided-CC-defin.patch b/projects/zlib/0001-Fix-configure-issue-that-discarded-provided-CC-defin.patch new file mode 100644 index 0000000..3aa91b2 --- /dev/null +++ b/projects/zlib/0001-Fix-configure-issue-that-discarded-provided-CC-defin.patch @@ -0,0 +1,24 @@ +From 05796d3d8d5546cf1b4dfe2cd72ab746afae505d Mon Sep 17 00:00:00 2001 +From: Mark Adler madler@alumni.caltech.edu +Date: Mon, 28 Mar 2022 18:34:10 -0700 +Subject: [PATCH] Fix configure issue that discarded provided CC definition. + +--- + configure | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/configure b/configure +index 52ff4a0..3fa3e86 100755 +--- a/configure ++++ b/configure +@@ -174,7 +174,10 @@ if test -z "$CC"; then + else + cc=${CROSS_PREFIX}cc + fi ++else ++ cc=${CC} + fi ++ + cflags=${CFLAGS-"-O3"} + # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure + case "$cc" in diff --git a/projects/zlib/build b/projects/zlib/build index 25f31f5..943a895 100644 --- a/projects/zlib/build +++ b/projects/zlib/build @@ -5,6 +5,10 @@ distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] + +# Fix for tor-browser-build#40470 +patch -p1 < $rootdir/0001-Fix-configure-issue-that-discarded-provided-CC-defin.patch + [% IF c("var/windows") -%] make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j[% c("buildconf/num_procs") %] SHARED_MODE=1 LOC="[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]" make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j[% c("buildconf/num_procs") %] SHARED_MODE=1 LOC="[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]" install diff --git a/projects/zlib/config b/projects/zlib/config index e6d550a..957ef6d 100644 --- a/projects/zlib/config +++ b/projects/zlib/config @@ -15,3 +15,4 @@ input_files: - project: container-image - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' + - filename: 0001-Fix-configure-issue-that-discarded-provided-CC-defin.patch