summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libz/build/bootstrap.build1
-rw-r--r--libz/build/export.build1
-rw-r--r--libz/build/root.build1
-rw-r--r--libz/buildfile1
-rw-r--r--libz/libz/buildfile7
-rw-r--r--libz/manifest2
-rw-r--r--libz/tests/build/bootstrap.build1
-rw-r--r--libz/tests/build/root.build1
-rw-r--r--libz/tests/buildfile1
-rw-r--r--libz/tests/minigzip/buildfile1
-rw-r--r--libz/tests/minigzip/testscript1
11 files changed, 6 insertions, 12 deletions
diff --git a/libz/build/bootstrap.build b/libz/build/bootstrap.build
index 4bd5a50..10e9b8a 100644
--- a/libz/build/bootstrap.build
+++ b/libz/build/bootstrap.build
@@ -1,5 +1,4 @@
# file : build/bootstrap.build
-# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd
# license : zlib License; see accompanying LICENSE file
project = libz
diff --git a/libz/build/export.build b/libz/build/export.build
index 91c9d5a..193232d 100644
--- a/libz/build/export.build
+++ b/libz/build/export.build
@@ -1,5 +1,4 @@
# file : build/export.build
-# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd
# license : zlib License; see accompanying LICENSE file
$out_root/
diff --git a/libz/build/root.build b/libz/build/root.build
index eab145c..92282d7 100644
--- a/libz/build/root.build
+++ b/libz/build/root.build
@@ -1,5 +1,4 @@
# file : build/root.build
-# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd
# license : zlib License; see accompanying LICENSE file
using in
diff --git a/libz/buildfile b/libz/buildfile
index 64db3f7..a8a0d4a 100644
--- a/libz/buildfile
+++ b/libz/buildfile
@@ -1,5 +1,4 @@
# file : buildfile
-# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd
# license : zlib License; see accompanying LICENSE file
./: {*/ -build/} doc{LICENSE INSTALL README} manifest
diff --git a/libz/libz/buildfile b/libz/libz/buildfile
index 0eb118f..32d97e4 100644
--- a/libz/libz/buildfile
+++ b/libz/libz/buildfile
@@ -1,14 +1,17 @@
# file : libz/buildfile
-# copyright : Copyright (c) 2018-2019 Code Synthesis Ltd
# license : zlib License; see accompanying LICENSE file
-lib{z}: {h c}{*} {def}{zlib} {file}{zlib.map}
+lib{z}: {h c}{*} def{zlib}
tclass = $c.target.class
tsys = $c.target.system
+linux = ($tclass == 'linux')
+bsd = ($tclass == 'bsd')
windows = ($tclass == 'windows')
+lib{z}: file{zlib.map}: include = ($linux || $bsd ? adhoc : false)
+
# Include the generated config header into the distribution (so that we don't
# pick up an installed one) and don't remove it when cleaning in src (so that
# clean results in a state identical to distributed).
diff --git a/libz/manifest b/libz/manifest
index f293042..0e773b8 100644
--- a/libz/manifest
+++ b/libz/manifest
@@ -1,6 +1,6 @@
: 1
name: libz
-version: 1.2.1100
+version: 1.2.1100+1
upstream-version: 1.2.11
project: zlib
summary: General-purpose lossless data compression C library
diff --git a/libz/tests/build/bootstrap.build b/libz/tests/build/bootstrap.build
index 5cdd64e..db488ec 100644
--- a/libz/tests/build/bootstrap.build
+++ b/libz/tests/build/bootstrap.build
@@ -1,5 +1,4 @@
# file : tests/build/bootstrap.build
-# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd
# license : zlib License; see accompanying LICENSE file
project = # Unnamed subproject.
diff --git a/libz/tests/build/root.build b/libz/tests/build/root.build
index 3f268d9..6e74398 100644
--- a/libz/tests/build/root.build
+++ b/libz/tests/build/root.build
@@ -1,5 +1,4 @@
# file : tests/build/root.build
-# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd
# license : zlib License; see accompanying LICENSE file
using c
diff --git a/libz/tests/buildfile b/libz/tests/buildfile
index 6192ac9..c7f4016 100644
--- a/libz/tests/buildfile
+++ b/libz/tests/buildfile
@@ -1,5 +1,4 @@
# file : tests/buildfile
-# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd
# license : zlib License; see accompanying LICENSE file
./: {*/ -build/}
diff --git a/libz/tests/minigzip/buildfile b/libz/tests/minigzip/buildfile
index 4f9e780..660d759 100644
--- a/libz/tests/minigzip/buildfile
+++ b/libz/tests/minigzip/buildfile
@@ -1,5 +1,4 @@
# file : tests/minigzip/buildfile
-# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd
# license : zlib License; see accompanying LICENSE file
import libs = libz%lib{z}
diff --git a/libz/tests/minigzip/testscript b/libz/tests/minigzip/testscript
index c633b56..92b03fc 100644
--- a/libz/tests/minigzip/testscript
+++ b/libz/tests/minigzip/testscript
@@ -1,5 +1,4 @@
# file : tests/minigzip/testscript
-# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd
# license : zlib License; see accompanying LICENSE file
s='abcdefghijklmnopqrstuvwxz0123456789'