summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2020-01-27 13:40:03 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2020-01-29 22:43:16 +0300
commit1e1e500657c4d7dae097c1196f78d4998d020554 (patch)
tree0c50dba7aeb0242a66a1b09fa0831963903fb557
parent88f3a501993e862b616c4b243976af8d8e7a968b (diff)
Release version 8.0.15+7v8.0.15+7
Add zlib package dependency instead of bundling zlib
-rw-r--r--README-DEV42
-rw-r--r--libmysqlclient/README-DEV9
-rw-r--r--libmysqlclient/TODO1
-rw-r--r--libmysqlclient/manifest3
-rw-r--r--libmysqlclient/mysql/buildfile29
-rw-r--r--libmysqlclient/mysql/zconf.h537
l---------libmysqlclient/mysql/zconf.h.cmakein.orig1
l---------libmysqlclient/mysql/zlib1
-rw-r--r--repositories.manifest4
9 files changed, 42 insertions, 585 deletions
diff --git a/README-DEV b/README-DEV
index da4a9bb..8cf054c 100644
--- a/README-DEV
+++ b/README-DEV
@@ -26,16 +26,26 @@ reproduce the union of features configured for the upstream source package in
Debian and Fedora distributions. The configuration options defining these sets
are specified in the Debian's rules and Fedora's RPM .spec files. Note,
however, that at the time of this writing the latest packaged versions are
-different: 5.7.25 on Debian and 8.0.15 on Fedora. These files can be obtained
+different: 5.7.26 on Debian and 8.0.15 on Fedora. These files can be obtained
as follows:
$ wget https://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/c/community-mysql-8.0.15-1.fc30.src.rpm
$ rpm2cpio community-mysql-8.0.15-1.fc30.src.rpm | cpio -civ '*.spec'
-#$ wget http://deb.debian.org/debian/pool/main/m/mysql-5.7/mysql-5.7_5.7.25-1.debian.tar.xz
-#$ tar xf mysql-5.7_5.7.25-1.debian.tar.xz debian/rules
+#$ wget http://deb.debian.org/debian/pool/main/m/mysql-5.7/mysql-5.7_5.7.26-1.debian.tar.xz
+#$ tar xf mysql-5.7_5.7.26-1.debian.tar.xz debian/rules
-Instead of using MySQL 5.7.25 Debian's rules for MySQL 8.0.15 we are
+As a side note, on Debian and Fedora the source, library, and headers are
+packaged as follows:
+
+ src library headers
+Debian/Ubuntu: mysql-5.7 libmysqlclient20 libmysqlclient-dev
+Fedora/RHEL: community-mysql community-mysql-libs community-mysql-devel
+
+Search for the Debian and Fedora packages at https://packages.debian.org/search
+and https://apps.fedoraproject.org/packages/.
+
+Instead of using MySQL 5.7.26 Debian's rules for MySQL 8.0.15 we are
packaging, let's use upstream/packaging/deb-in/rules.in. That's not ideal but
is, probably, better than nothing.
@@ -47,22 +57,16 @@ Debian:
Fedora:
- -DWITH_INNODB_MEMCACHED=ON -DENABLED_LOCAL_INFILE=ON
+ -DWITH_INNODB_MEMCACHED=ON -DENABLED_LOCAL_INFILE=ON -DWITH_SYSTEM_LIBS=ON
-Omitting options that are not related to the client library we end up with:
+Omitting options that are not related to the client library or introduce
+external dependencies that are not packaged for build2 we end up with:
- -DENABLED_LOCAL_INFILE=ON
+ -DENABLED_LOCAL_INFILE=ON -DWITH_ZLIB=system -DWITH_SSL=system
See the configuration options description at
https://dev.mysql.com/doc/refman/8.0/en/source-configuration-options.html
-As a side note, on Debian and Fedora libmysqlclient is packaged under the
-libmysqlclient20 and community-mysql-libs package names respectively. The
-headers-containing development packages are libmysqlclient-dev and
-community-mysql-devel. Search for the Debian and Fedora packages at
-https://packages.debian.org/search and
-https://apps.fedoraproject.org/packages/.
-
Normally, when packaging a cmake-based project, we try to deduce the source
file and compilation/linking option sets analyzing the root and
feature/component/platform-specific CMakeLists.txt and .cmake files. In
@@ -77,7 +81,7 @@ On POSIX:
$ mkdir build
$ cd build
$ cmake -DDOWNLOAD_BOOST=ON -DWITH_BOOST=../boost -DWITHOUT_SERVER=ON \
- -DENABLED_LOCAL_INFILE=ON ..
+ -DENABLED_LOCAL_INFILE=ON -DWITH_ZLIB=system -DWITH_SSL=system ..
$ make VERBOSE=1 >build.log 2>&1
@@ -98,7 +102,8 @@ Build libssl from cppget.org, install to C:/openssl and rename *.dll.lib to
> mkdir build
> cd build
> cmake -DDOWNLOAD_BOOST=ON -DWITH_BOOST=../boost -DWITHOUT_SERVER=ON ^
- -DENABLED_LOCAL_INFILE=ON .. -G "Visual Studio 15 2017 Win64" ^ >config.log 2>&1
+ -DENABLED_LOCAL_INFILE=ON -DWITH_ZLIB=system -DWITH_SSL=system .. ^
+ -G "Visual Studio 15 2017 Win64" >config.log 2>&1
> devenv MySQL.sln /build RelWithDebInfo >build-log 2>&1
With MinGW GCC:
@@ -112,7 +117,8 @@ it fails at the compilation stage:
> mkdir build
> cd build
> cmake -DDOWNLOAD_BOOST=ON -DWITH_BOOST=../boost -DWITHOUT_SERVER=ON ^
- -DENABLED_LOCAL_INFILE=ON .. -G "MinGW Makefiles"
+ -DENABLED_LOCAL_INFILE=ON -DWITH_ZLIB=system -DWITH_SSL=system .. ^
+ -G "MinGW Makefiles"
> mingw32-make
When the packaging is complete, build all the project packages in source tree
@@ -127,4 +133,4 @@ Afterwards grep through the remained headers for some patterns:
$ cat `find . -type f -name '*.d'` | sort -u >headers
$ emacs headers # Edit, leaving system headers only.
-$ fgrep -e 'mysql' -e 'mariadb' -e 'openssl' -e 'zlib' headers
+$ fgrep -e 'mysql' -e 'mariadb' headers
diff --git a/libmysqlclient/README-DEV b/libmysqlclient/README-DEV
index dae02b1..f83016d 100644
--- a/libmysqlclient/README-DEV
+++ b/libmysqlclient/README-DEV
@@ -7,7 +7,7 @@ for auto-generated headers:
$ ln -s ../upstream/LICENSE
-$ ln -s ../../upstream/{extra/zlib,strings,vio,sql-common,sql,mysys,mysys_ssl,libbinlogevents,libmysql} \
+$ ln -s ../../upstream/{strings,vio,sql-common,sql,mysys,mysys_ssl,libbinlogevents,libmysql} \
mysql
$ ln -s ../../upstream/include mysql/mysql
@@ -18,11 +18,6 @@ impossible using the header-generating machinery. That's why we create
mysql/mysql_version.h that includes <mysql/version.h> that we auto-generate
from upstream's mysql/mysql_version.h.in.
-$ ln -s zlib/zconf.h.cmakein mysql/zconf.h.cmakein.orig
-
-Use mysql/zconf.h.cmakein.orig for creating mysql/zconf.h manually,
-defining/undefining macros introduced with #cmakedefine.
-
$ ln -s libbinlogevents/binlog_config.h.cmake mysql/binlog_config.h.cmake.orig
Use mysql/binlog_config.h.cmake.orig for creating mysql/binlog_config.h
@@ -91,7 +86,7 @@ $ rpm2cpio community-mysql-devel-8.0.15-1.fc30.aarch64.rpm | cpio -idv ./usr/inc
Deducing the source file set and compilation/linking options can probably be
performed by analyzing the root and component-specific CMakeLists.txt files
-(see libmysql/, zlib/, etc) and .cmake files under the upstream's cmake/
+(see libmysql/, etc) and .cmake files under the upstream's cmake/
subdirectory. In practice, however, you may also need to refer to
cmake-generated flags.make files or, as a last resort, to see the actual
compiler and linker command lines in the build log (see ../README-DEV for
diff --git a/libmysqlclient/TODO b/libmysqlclient/TODO
deleted file mode 100644
index d7aa6fd..0000000
--- a/libmysqlclient/TODO
+++ /dev/null
@@ -1 +0,0 @@
-- Unbundle zlib (but see changes/patches)?
diff --git a/libmysqlclient/manifest b/libmysqlclient/manifest
index 64f091a..75f56d6 100644
--- a/libmysqlclient/manifest
+++ b/libmysqlclient/manifest
@@ -3,7 +3,7 @@ name: libmysqlclient
# Note: remember to update doc-url below!
#
-version: 8.0.15+6
+version: 8.0.15+7
project: mysql
summary: MySQL C API client library
@@ -20,5 +20,6 @@ build-error-email: builds@build2.org
builds: all : -( +windows &gcc ) ; MinGW GCC is not supported.
depends: * build2 >= 0.12.0
depends: * bpkg >= 0.12.0
+depends: libz >= 1.2.1100
depends: libcrypto >= 1.1.1
depends: libssl >= 1.1.1
diff --git a/libmysqlclient/mysql/buildfile b/libmysqlclient/mysql/buildfile
index 85af149..bda8970 100644
--- a/libmysqlclient/mysql/buildfile
+++ b/libmysqlclient/mysql/buildfile
@@ -4,6 +4,7 @@
import imp_libs = libssl%lib{ssl}
import imp_libs += libcrypto%lib{crypto}
+import imp_libs += libz%lib{z}
tclass = $c.target.class
tsys = $c.target.system
@@ -23,7 +24,6 @@ vio_win32 = viopipe vioshm
lib{mysqlclient}: {h c }{* -version -config} \
{h }{ version config} \
- zlib/{h c }{* } \
strings/{ hxx cxx}{* -do_ctype -*dump* -*_to_*} \
mysql/{h }{** } \
libbinlogevents/{h }{** } \
@@ -52,7 +52,7 @@ libmysql/authentication_win/{hxx cxx}{* }: include = $windows
# Makes sense to distribute READMEs for the bundled libraries. Note that their
# licenses are incorporated into the root LICENSE file.
#
-lib{mysqlclient}: zlib/file{README} strings/file{README}
+lib{mysqlclient}: strings/file{README}
# Include the generated version header into the distribution (so that we
# don't pick up an installed one) and don't remove it when cleaning in src (so
@@ -156,31 +156,22 @@ switch $tclass
#
cc.poptions =+ "-I$out_root" "-I$src_root" "-I$src_base" "-I$src_base/mysql"
-zlib_dir = $src_base/zlib
-
# To keep "-I$out_root" "-I$src_root" first we use '+=', rather than '=+' to
# append poptions for the directory scopes.
#
-zlib/ cc.poptions += "-I$zlib_dir"
-
strings/ cc.poptions += -DDISABLE_MYSQL_THREAD_H
libbinlogevents_dir = $src_base/libbinlogevents
-mysys/ cc.poptions += "-I$zlib_dir" "-I$libbinlogevents_dir/export"
+mysys/ cc.poptions += "-I$libbinlogevents_dir/export"
libmysql/ cc.poptions += "-I$libbinlogevents_dir/export" \
-DCLIENT_PROTOCOL_TRACING
-sql-common/ cc.poptions += "-I$zlib_dir" \
- "-I$libbinlogevents_dir/export" \
+sql-common/ cc.poptions += "-I$libbinlogevents_dir/export" \
"-I$libbinlogevents_dir/include"
-if! $windows
-{
- zlib/ cc.poptions += -D_LARGEFILE64_SOURCE=1
-}
-else
+if $windows
{
sql-common/ cc.poptions += -DAUTHENTICATION_WIN
@@ -190,11 +181,6 @@ else
libmysql/authentication_win/ cc.poptions += -DSECURITY_WIN32
}
-# Disable the 'POSIX name for this item is deprecated' warnings.
-#
-if ($c.id == 'clang' && $tsys == 'win32-msvc')
- cc.coptions += -Wno-deprecated-declarations
-
switch $c.class
{
case 'gcc'
@@ -209,6 +195,11 @@ switch $c.class
# treating them as errors.
#
cc.coptions += -Wno-all -Wno-extra -Wno-error
+
+ # Disable the Clang targeting MSVC warnings.
+ #
+ if ($c.id == 'clang' && $tsys == 'win32-msvc')
+ cc.coptions += -Wno-deprecated-declarations
}
case 'msvc'
{
diff --git a/libmysqlclient/mysql/zconf.h b/libmysqlclient/mysql/zconf.h
deleted file mode 100644
index c50838e..0000000
--- a/libmysqlclient/mysql/zconf.h
+++ /dev/null
@@ -1,537 +0,0 @@
-/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#ifndef ZCONF_H
-#define ZCONF_H
-
-#undef Z_PREFIX
-#include <mysql/my_config.h> // HAVE_UNISTD_H
-
-/*
- * If you *really* need a unique prefix for all types and library functions,
- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
- * Even better than compiling with -DZ_PREFIX would be to use configure to set
- * this permanently in zconf.h using "./configure --zprefix".
- */
-#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
-# define Z_PREFIX_SET
-
-/* all linked symbols and init macros */
-# define _dist_code z__dist_code
-# define _length_code z__length_code
-# define _tr_align z__tr_align
-# define _tr_flush_bits z__tr_flush_bits
-# define _tr_flush_block z__tr_flush_block
-# define _tr_init z__tr_init
-# define _tr_stored_block z__tr_stored_block
-# define _tr_tally z__tr_tally
-# define adler32 z_adler32
-# define adler32_combine z_adler32_combine
-# define adler32_combine64 z_adler32_combine64
-# define adler32_z z_adler32_z
-# ifndef Z_SOLO
-# define compress z_compress
-# define compress2 z_compress2
-# define compressBound z_compressBound
-# endif
-# define crc32 z_crc32
-# define crc32_combine z_crc32_combine
-# define crc32_combine64 z_crc32_combine64
-# define crc32_z z_crc32_z
-# define deflate z_deflate
-# define deflateBound z_deflateBound
-# define deflateCopy z_deflateCopy
-# define deflateEnd z_deflateEnd
-# define deflateGetDictionary z_deflateGetDictionary
-# define deflateInit z_deflateInit
-# define deflateInit2 z_deflateInit2
-# define deflateInit2_ z_deflateInit2_
-# define deflateInit_ z_deflateInit_
-# define deflateParams z_deflateParams
-# define deflatePending z_deflatePending
-# define deflatePrime z_deflatePrime
-# define deflateReset z_deflateReset
-# define deflateResetKeep z_deflateResetKeep
-# define deflateSetDictionary z_deflateSetDictionary
-# define deflateSetHeader z_deflateSetHeader
-# define deflateTune z_deflateTune
-# define deflate_copyright z_deflate_copyright
-# define get_crc_table z_get_crc_table
-# ifndef Z_SOLO
-# define gz_error z_gz_error
-# define gz_intmax z_gz_intmax
-# define gz_strwinerror z_gz_strwinerror
-# define gzbuffer z_gzbuffer
-# define gzclearerr z_gzclearerr
-# define gzclose z_gzclose
-# define gzclose_r z_gzclose_r
-# define gzclose_w z_gzclose_w
-# define gzdirect z_gzdirect
-# define gzdopen z_gzdopen
-# define gzeof z_gzeof
-# define gzerror z_gzerror
-# define gzflush z_gzflush
-# define gzfread z_gzfread
-# define gzfwrite z_gzfwrite
-# define gzgetc z_gzgetc
-# define gzgetc_ z_gzgetc_
-# define gzgets z_gzgets
-# define gzoffset z_gzoffset
-# define gzoffset64 z_gzoffset64
-# define gzopen z_gzopen
-# define gzopen64 z_gzopen64
-# ifdef _WIN32
-# define gzopen_w z_gzopen_w
-# endif
-# define gzprintf z_gzprintf
-# define gzputc z_gzputc
-# define gzputs z_gzputs
-# define gzread z_gzread
-# define gzrewind z_gzrewind
-# define gzseek z_gzseek
-# define gzseek64 z_gzseek64
-# define gzsetparams z_gzsetparams
-# define gztell z_gztell
-# define gztell64 z_gztell64
-# define gzungetc z_gzungetc
-# define gzvprintf z_gzvprintf
-# define gzwrite z_gzwrite
-# endif
-# define inflate z_inflate
-# define inflateBack z_inflateBack
-# define inflateBackEnd z_inflateBackEnd
-# define inflateBackInit z_inflateBackInit
-# define inflateBackInit_ z_inflateBackInit_
-# define inflateCodesUsed z_inflateCodesUsed
-# define inflateCopy z_inflateCopy
-# define inflateEnd z_inflateEnd
-# define inflateGetDictionary z_inflateGetDictionary
-# define inflateGetHeader z_inflateGetHeader
-# define inflateInit z_inflateInit
-# define inflateInit2 z_inflateInit2
-# define inflateInit2_ z_inflateInit2_
-# define inflateInit_ z_inflateInit_
-# define inflateMark z_inflateMark
-# define inflatePrime z_inflatePrime
-# define inflateReset z_inflateReset
-# define inflateReset2 z_inflateReset2
-# define inflateResetKeep z_inflateResetKeep
-# define inflateSetDictionary z_inflateSetDictionary
-# define inflateSync z_inflateSync
-# define inflateSyncPoint z_inflateSyncPoint
-# define inflateUndermine z_inflateUndermine
-# define inflateValidate z_inflateValidate
-# define inflate_copyright z_inflate_copyright
-# define inflate_fast z_inflate_fast
-# define inflate_table z_inflate_table
-# ifndef Z_SOLO
-# define uncompress z_uncompress
-# define uncompress2 z_uncompress2
-# endif
-# define zError z_zError
-# ifndef Z_SOLO
-# define zcalloc z_zcalloc
-# define zcfree z_zcfree
-# endif
-# define zlibCompileFlags z_zlibCompileFlags
-# define zlibVersion z_zlibVersion
-
-/* all zlib typedefs in zlib.h and zconf.h */
-# define Byte z_Byte
-# define Bytef z_Bytef
-# define alloc_func z_alloc_func
-# define charf z_charf
-# define free_func z_free_func
-# ifndef Z_SOLO
-# define gzFile z_gzFile
-# endif
-# define gz_header z_gz_header
-# define gz_headerp z_gz_headerp
-# define in_func z_in_func
-# define intf z_intf
-# define out_func z_out_func
-# define uInt z_uInt
-# define uIntf z_uIntf
-# define uLong z_uLong
-# define uLongf z_uLongf
-# define voidp z_voidp
-# define voidpc z_voidpc
-# define voidpf z_voidpf
-
-/* all zlib structs in zlib.h and zconf.h */
-# define gz_header_s z_gz_header_s
-# define internal_state z_internal_state
-
-#endif
-
-#if defined(__MSDOS__) && !defined(MSDOS)
-# define MSDOS
-#endif
-#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
-# define OS2
-#endif
-#if defined(_WINDOWS) && !defined(WINDOWS)
-# define WINDOWS
-#endif
-#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
-# ifndef WIN32
-# define WIN32
-# endif
-#endif
-#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
-# if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
-# ifndef SYS16BIT
-# define SYS16BIT
-# endif
-# endif
-#endif
-
-/*
- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
- * than 64k bytes at a time (needed on systems with 16-bit int).
- */
-#ifdef SYS16BIT
-# define MAXSEG_64K
-#endif
-#ifdef MSDOS
-# define UNALIGNED_OK
-#endif
-
-#ifdef __STDC_VERSION__
-# ifndef STDC
-# define STDC
-# endif
-# if __STDC_VERSION__ >= 199901L
-# ifndef STDC99
-# define STDC99
-# endif
-# endif
-#endif
-#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
-# define STDC
-#endif
-#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
-# define STDC
-#endif
-#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
-# define STDC
-#endif
-#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
-# define STDC
-#endif
-
-#if defined(__OS400__) && !defined(STDC) /* iSeries (formerly AS/400). */
-# define STDC
-#endif
-
-#ifndef STDC
-# ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
-# define const /* note: need a more gentle solution here */
-# endif
-#endif
-
-#if defined(ZLIB_CONST) && !defined(z_const)
-# define z_const const
-#else
-# define z_const
-#endif
-
-#ifdef Z_SOLO
- typedef unsigned long z_size_t;
-#else
-# define z_longlong long long
-# if defined(NO_SIZE_T)
- typedef unsigned NO_SIZE_T z_size_t;
-# elif defined(STDC)
-# include <stddef.h>
- typedef size_t z_size_t;
-# else
- typedef unsigned long z_size_t;
-# endif
-# undef z_longlong
-#endif
-
-/* Maximum value for memLevel in deflateInit2 */
-#ifndef MAX_MEM_LEVEL
-# ifdef MAXSEG_64K
-# define MAX_MEM_LEVEL 8
-# else
-# define MAX_MEM_LEVEL 9
-# endif
-#endif
-
-/* Maximum value for windowBits in deflateInit2 and inflateInit2.
- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
- * created by gzip. (Files created by minigzip can still be extracted by
- * gzip.)
- */
-#ifndef MAX_WBITS
-# define MAX_WBITS 15 /* 32K LZ77 window */
-#endif
-
-/* The memory requirements for deflate are (in bytes):
- (1 << (windowBits+2)) + (1 << (memLevel+9))
- that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values)
- plus a few kilobytes for small objects. For example, if you want to reduce
- the default memory requirements from 256K to 128K, compile with
- make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
- Of course this will generally degrade compression (there's no free lunch).
-
- The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus about 7 kilobytes
- for small objects.
-*/
-
- /* Type declarations */
-
-#ifndef OF /* function prototypes */
-# ifdef STDC
-# define OF(args) args
-# else
-# define OF(args) ()
-# endif
-#endif
-
-#ifndef Z_ARG /* function prototypes for stdarg */
-# if defined(STDC) || defined(Z_HAVE_STDARG_H)
-# define Z_ARG(args) args
-# else
-# define Z_ARG(args) ()
-# endif
-#endif
-
-/* The following definitions for FAR are needed only for MSDOS mixed
- * model programming (small or medium model with some far allocations).
- * This was tested only with MSC; for other MSDOS compilers you may have
- * to define NO_MEMCPY in zutil.h. If you don't need the mixed model,
- * just define FAR to be empty.
- */
-#ifdef SYS16BIT
-# if defined(M_I86SM) || defined(M_I86MM)
- /* MSC small or medium model */
-# define SMALL_MEDIUM
-# ifdef _MSC_VER
-# define FAR _far
-# else
-# define FAR far
-# endif
-# endif
-# if (defined(__SMALL__) || defined(__MEDIUM__))
- /* Turbo C small or medium model */
-# define SMALL_MEDIUM
-# ifdef __BORLANDC__
-# define FAR _far
-# else
-# define FAR far
-# endif
-# endif
-#endif
-
-#if defined(WINDOWS) || defined(WIN32)
- /* If building or using zlib as a DLL, define ZLIB_DLL.
- * This is not mandatory, but it offers a little performance increase.
- */
-# ifdef ZLIB_DLL
-# if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
-# ifdef ZLIB_INTERNAL
-# define ZEXTERN extern __declspec(dllexport)
-# else
-# define ZEXTERN extern __declspec(dllimport)
-# endif
-# endif
-# endif /* ZLIB_DLL */
- /* If building or using zlib with the WINAPI/WINAPIV calling convention,
- * define ZLIB_WINAPI.
- * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
- */
-# ifdef ZLIB_WINAPI
-# ifdef FAR
-# undef FAR
-# endif
-# include <windows.h>
- /* No need for _export, use ZLIB.DEF instead. */
- /* For complete Windows compatibility, use WINAPI, not __stdcall. */
-# define ZEXPORT WINAPI
-# ifdef WIN32
-# define ZEXPORTVA WINAPIV
-# else
-# define ZEXPORTVA FAR CDECL
-# endif
-# endif
-#endif
-
-#if defined (__BEOS__)
-# ifdef ZLIB_DLL
-# ifdef ZLIB_INTERNAL
-# define ZEXPORT __declspec(dllexport)
-# define ZEXPORTVA __declspec(dllexport)
-# else
-# define ZEXPORT __declspec(dllimport)
-# define ZEXPORTVA __declspec(dllimport)
-# endif
-# endif
-#endif
-
-#ifndef ZEXTERN
-# define ZEXTERN extern
-#endif
-#ifndef ZEXPORT
-# define ZEXPORT
-#endif
-#ifndef ZEXPORTVA
-# define ZEXPORTVA
-#endif
-
-#ifndef FAR
-# define FAR
-#endif
-
-#if !defined(__MACTYPES__)
-typedef unsigned char Byte; /* 8 bits */
-#endif
-typedef unsigned int uInt; /* 16 bits or more */
-typedef unsigned long uLong; /* 32 bits or more */
-
-#ifdef SMALL_MEDIUM
- /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
-# define Bytef Byte FAR
-#else
- typedef Byte FAR Bytef;
-#endif
-typedef char FAR charf;
-typedef int FAR intf;
-typedef uInt FAR uIntf;
-typedef uLong FAR uLongf;
-
-#ifdef STDC
- typedef void const *voidpc;
- typedef void FAR *voidpf;
- typedef void *voidp;
-#else
- typedef Byte const *voidpc;
- typedef Byte FAR *voidpf;
- typedef Byte *voidp;
-#endif
-
-#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
-# include <limits.h>
-# if (UINT_MAX == 0xffffffffUL)
-# define Z_U4 unsigned
-# elif (ULONG_MAX == 0xffffffffUL)
-# define Z_U4 unsigned long
-# elif (USHRT_MAX == 0xffffffffUL)
-# define Z_U4 unsigned short
-# endif
-#endif
-
-#ifdef Z_U4
- typedef Z_U4 z_crc_t;
-#else
- typedef unsigned long z_crc_t;
-#endif
-
-#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */
-# define Z_HAVE_UNISTD_H
-#endif
-
-#ifdef HAVE_STDARG_H /* may be set to #if 1 by ./configure */
-# define Z_HAVE_STDARG_H
-#endif
-
-#ifdef STDC
-# ifndef Z_SOLO
-# include <sys/types.h> /* for off_t */
-# endif
-#endif
-
-#if defined(STDC) || defined(Z_HAVE_STDARG_H)
-# ifndef Z_SOLO
-# include <stdarg.h> /* for va_list */
-# endif
-#endif
-
-#ifdef _WIN32
-# ifndef Z_SOLO
-# include <stddef.h> /* for wchar_t */
-# endif
-#endif
-
-/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
- * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
- * though the former does not conform to the LFS document), but considering
- * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
- * equivalently requesting no 64-bit operations
- */
-#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
-# undef _LARGEFILE64_SOURCE
-#endif
-
-#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
-# define Z_HAVE_UNISTD_H
-#endif
-#ifndef Z_SOLO
-# if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
-# include <unistd.h> /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
-# ifdef VMS
-# include <unixio.h> /* for off_t */
-# endif
-# ifndef z_off_t
-# define z_off_t off_t
-# endif
-# endif
-#endif
-
-#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
-# define Z_LFS64
-#endif
-
-#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
-# define Z_LARGE64
-#endif
-
-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
-# define Z_WANT64
-#endif
-
-#if !defined(SEEK_SET) && !defined(Z_SOLO)
-# define SEEK_SET 0 /* Seek from beginning of file. */
-# define SEEK_CUR 1 /* Seek from current position. */
-# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */
-#endif
-
-#ifndef z_off_t
-# define z_off_t long
-#endif
-
-#if !defined(_WIN32) && defined(Z_LARGE64)
-# define z_off64_t off64_t
-#else
-# if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
-# define z_off64_t __int64
-# else
-# define z_off64_t z_off_t
-# endif
-#endif
-
-/* MVS linker does not support external names larger than 8 bytes */
-#if defined(__MVS__)
- #pragma map(deflateInit_,"DEIN")
- #pragma map(deflateInit2_,"DEIN2")
- #pragma map(deflateEnd,"DEEND")
- #pragma map(deflateBound,"DEBND")
- #pragma map(inflateInit_,"ININ")
- #pragma map(inflateInit2_,"ININ2")
- #pragma map(inflateEnd,"INEND")
- #pragma map(inflateSync,"INSY")
- #pragma map(inflateSetDictionary,"INSEDI")
- #pragma map(compressBound,"CMBND")
- #pragma map(inflate_table,"INTABL")
- #pragma map(inflate_fast,"INFA")
- #pragma map(inflate_copyright,"INCOPY")
-#endif
-
-#endif /* ZCONF_H */
diff --git a/libmysqlclient/mysql/zconf.h.cmakein.orig b/libmysqlclient/mysql/zconf.h.cmakein.orig
deleted file mode 120000
index 32419e7..0000000
--- a/libmysqlclient/mysql/zconf.h.cmakein.orig
+++ /dev/null
@@ -1 +0,0 @@
-zlib/zconf.h.cmakein \ No newline at end of file
diff --git a/libmysqlclient/mysql/zlib b/libmysqlclient/mysql/zlib
deleted file mode 120000
index 0125eef..0000000
--- a/libmysqlclient/mysql/zlib
+++ /dev/null
@@ -1 +0,0 @@
-../../upstream/extra/zlib \ No newline at end of file
diff --git a/repositories.manifest b/repositories.manifest
index 654544f..b497312 100644
--- a/repositories.manifest
+++ b/repositories.manifest
@@ -4,3 +4,7 @@ summary: MySQL build2 package repository
:
role: prerequisite
location: ../../openssl/openssl.git##HEAD
+
+:
+role: prerequisite
+location: ../../zlib/zlib.git##HEAD