зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1796811 - Upgrade zlib to 1.2.13 for NSIS. r=glandium
Depends on D159950 Differential Revision: https://phabricator.services.mozilla.com/D159951
This commit is contained in:
Родитель
a15a904f7f
Коммит
1d8dd9411b
|
@ -182,13 +182,13 @@ grcov-osx-x86_64:
|
|||
sha256: c7c323e0647b1309b412874000d677e8f5b898401ec57761c57a9c396c433823
|
||||
size: 2476735
|
||||
|
||||
zlib-1.2.12:
|
||||
description: zlib 1.2.12 source code
|
||||
zlib-1.2.13:
|
||||
description: zlib 1.2.13 source code
|
||||
fetch:
|
||||
type: static-url
|
||||
url: http://zlib.net/zlib-1.2.12.tar.gz
|
||||
sha256: 91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9
|
||||
size: 1490071
|
||||
url: https://zlib.net/zlib-1.2.13.tar.gz
|
||||
sha256: b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30
|
||||
size: 1497445
|
||||
gpg-signature:
|
||||
sig-url: "{url}.asc"
|
||||
key-path: build/unix/build-gcc/5ED46A6721D365587791E2AA783FCD8E58BCAFBA.key
|
||||
|
|
|
@ -19,7 +19,7 @@ linux64-mingw32-nsis:
|
|||
fetches:
|
||||
fetch:
|
||||
- nsis-3.07
|
||||
- zlib-1.2.12
|
||||
- zlib-1.2.13
|
||||
toolchain:
|
||||
- linux64-binutils
|
||||
- linux64-clang-mingw-x86
|
||||
|
|
|
@ -28,7 +28,7 @@ ln -s i686-w64-mingw32-clang++ $MOZ_FETCHES_DIR/clang/bin/i686-w64-mingw32-g++
|
|||
|
||||
# --------------
|
||||
|
||||
cd zlib-1.2.12
|
||||
cd zlib-1.2.13
|
||||
make -f win32/Makefile.gcc PREFIX=i686-w64-mingw32-
|
||||
|
||||
cd ../nsis-3.07-src
|
||||
|
@ -53,7 +53,7 @@ scons \
|
|||
CC="clang --sysroot $MOZ_FETCHES_DIR/sysroot-x86_64-linux-gnu" \
|
||||
CXX="clang++ --sysroot $MOZ_FETCHES_DIR/sysroot-x86_64-linux-gnu" \
|
||||
XGCC_W32_PREFIX=i686-w64-mingw32- \
|
||||
ZLIB_W32=../zlib-1.2.12 \
|
||||
ZLIB_W32=../zlib-1.2.13 \
|
||||
SKIPUTILS="NSIS Menu,Makensisw" \
|
||||
PREFIX_DEST=$INSTALL_DIR/ \
|
||||
PREFIX_BIN=bin \
|
||||
|
|
Загрузка…
Ссылка в новой задаче