Commit d57eed10 authored by Martin Thomson's avatar Martin Thomson

Bug 1547639 - Automatic vendoring of zlib, r=jcj

Differential Revision: https://phabricator.services.mozilla.com/D58499

--HG--
extra : moz-landing-system : lando
parent a4b73f28
......@@ -9,10 +9,3 @@ Description:
NSS uses zlib in libSSL (for the DEFLATE compression method), modutil, and
signtool.
Local Modifications:
- patches/prune-zlib.sh: run this shell script to remove unneeded files
from the zlib distribution.
- patches/msvc-vsnprintf.patch: define HAVE_VSNPRINTF for Visual C++ 2008
(9.0) and later.
......@@ -8,13 +8,14 @@
# are specifed as dependencies within rules.mk.
#
TARGETS = $(LIBRARY) $(PROGRAMS)
TARGETS = $(LIBRARY)
SHARED_LIBRARY =
IMPORT_LIBRARY =
PROGRAM =
EXTRA_LIBS = $(LIBRARY)
ifeq ($(OS_TARGET),Linux)
ifneq ($(OS_ARCH),WINNT)
DEFINES += -DHAVE_UNISTD_H
endif
DEFINES += -DHAVE_STDARG_H
This diff is collapsed.
......@@ -28,8 +28,6 @@ CSRCS = adler32.c \
LIBRARY_NAME = zlib
PROGRAMS = example minigzip
# REQUIRES = nss
# Define verbose as -1 to turn off all zlib trace messages in
......
This diff is collapsed.
#!/usr/bin/env bash
# Vendor a new version of zlib.
#
# Note: This script doesn't remove files if they are removed in the zlib release.
set -e
if [[ $# -lt 1 ]]; then
echo "Usage: $0 <version>" 1>&2
exit 2
fi
version="$1"
ztmp="zlib.$version"
cd "$(dirname "$0")"
../../fuzz/config/git-copy.sh https://github.com/madler/zlib "v$version" "$ztmp"
fullversion="$version ("$(cat "$ztmp"/.git-copy)")"
sed -i -e 's/^Version: .*/Version: '"$fullversion"'/' README.nss
prune=(
.git-copy
.gitignore
CMakeLists.txt
ChangeLog
FAQ
INDEX
Makefile
Makefile.in
amiga
configure
contrib
doc
example.c
examples
make_vms.com
minigzip.c
msdos
nintendods
old
os400
qnx
test
treebuild.xml
watcom
win32
zconf.h.cmakein
zconf.h.in
zlib.3
zlib.3.pdf
zlib.map
zlib.pc.cmakein
zlib.pc.in
zlib2ansi
)
for i in "${prune[@]}"; do rm -rf "$ztmp"/"$i"; done
for i in "$ztmp"/*; do mv "$i" .; done
rmdir "$ztmp"
......@@ -42,6 +42,14 @@
# Define verbose as -1 to turn off all zlib trace messages in
# debug builds.
'verbose=-1',
'HAVE_STDARG_H',
],
'conditions': [
[ 'OS!="win"', {
'defines': [
'HAVE_UNISTD_H',
],
}],
],
}],
}]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment