[tbb-commits] [builders/tor-browser-build] 02/03: Bug 40690: Revert fix for zib build break

[gitolite role]

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

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

commit d078beef55f52daa4574e82c6c1602d778afb36b
Author: Richard Pospesel <richard at torproject.org>
AuthorDate: Fri Nov 18 16:29:46 2022 +0000

    Bug 40690: Revert fix for zib build break
---
 ...re-issue-that-discarded-provided-CC-defin.patch | 24 ----------------------
 projects/zlib/build                                |  3 ---
 projects/zlib/config                               |  3 +--
 3 files changed, 1 insertion(+), 29 deletions(-)

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
deleted file mode 100644
index 3aa91b2d..00000000
--- a/projects/zlib/0001-Fix-configure-issue-that-discarded-provided-CC-defin.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 05796d3d8d5546cf1b4dfe2cd72ab746afae505d Mon Sep 17 00:00:00 2001
-From: Mark Adler <madler at 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 55381ddc..cfad864d 100644
--- a/projects/zlib/build
+++ b/projects/zlib/build
@@ -6,9 +6,6 @@ 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("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("num_procs") %] SHARED_MODE=1 LOC="[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]" install
diff --git a/projects/zlib/config b/projects/zlib/config
index 7e27554e..0801a164 100644
--- a/projects/zlib/config
+++ b/projects/zlib/config
@@ -1,6 +1,6 @@
 # vim: filetype=yaml sw=2
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
-version: 1.2.12
+version: 1.2.13
 git_hash: 'v[% c("version") %]'
 git_url: https://github.com/madler/zlib.git
 gpg_keyring: zlib.gpg
@@ -15,4 +15,3 @@ input_files:
   - project: container-image
   - name: '[% c("var/compiler") %]'
     project: '[% c("var/compiler") %]'
-  - filename: 0001-Fix-configure-issue-that-discarded-provided-CC-defin.patch

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.