[tor-commits] [tor-browser-build/master] Bug 25859: Clean up zlib's build script

[gk at torproject.org]

commit 0e483da11bd8de64b3b881ef3484ae77f69759ed
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Fri May 25 19:48:38 2018 +0200

    Bug 25859: Clean up zlib's build script
    
    CFLAGS and LDFLAGS were unused. We are now defining them in LOC, using
    the definition of CFLAGS and LDFLAGS from rbm.conf.
    
    We also don't hardcode anymore -j4.
---
 projects/zlib/build  | 6 ++----
 projects/zlib/config | 1 +
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/projects/zlib/build b/projects/zlib/build
index ef26882..fe1377f 100644
--- a/projects/zlib/build
+++ b/projects/zlib/build
@@ -5,10 +5,8 @@ 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') %]
-export CFLAGS="[% c("var/CFLAGS") %]"
-export LDFLAGS="[% 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- -j4 SHARED_MODE=1 LOC="-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs"
-make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j4 SHARED_MODE=1 LOC="-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs" install
+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
 
 cd /var/tmp/dist
 [% c('tar', {
diff --git a/projects/zlib/config b/projects/zlib/config
index 3ad562c..4ac96c9 100644
--- a/projects/zlib/config
+++ b/projects/zlib/config
@@ -7,6 +7,7 @@ gpg_keyring: zlib.gpg
 tag_gpg_id: 1
 
 var:
+  flag_mwindows: ''
   container:
     use_container: 1