Skip to content

Commit 8efa34f

Browse files
committed
depends: add a zlib build
qt5.7 changed the location of some of its symbols, creating a circular dependency in Qt5Core. Rather than trying to fix that up, build our own zlib rather than having it built for us.
1 parent 342eb96 commit 8efa34f

File tree

3 files changed

+28
-3
lines changed

3 files changed

+28
-3
lines changed

depends/packages/packages.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ packages:=boost openssl libevent zeromq
22
native_packages := native_ccache
33

44
qt_native_packages = native_protobuf
5-
qt_packages = qrencode protobuf
5+
qt_packages = qrencode protobuf zlib
66

77
qt_x86_64_linux_packages:=qt expat dbus libxcb xcb_proto libXau xproto freetype fontconfig libX11 xextproto libXext xtrans
88
qt_i686_linux_packages:=$(qt_x86_64_linux_packages)

depends/packages/qt.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ $(package)_download_path=http://download.qt.io/official_releases/qt/5.7/$($(pack
44
$(package)_suffix=opensource-src-$($(package)_version).tar.gz
55
$(package)_file_name=qtbase-$($(package)_suffix)
66
$(package)_sha256_hash=95f83e532d23b3ddbde7973f380ecae1bac13230340557276f75f2e37984e410
7-
$(package)_dependencies=openssl
7+
$(package)_dependencies=openssl zlib
88
$(package)_linux_dependencies=freetype fontconfig libxcb libX11 xproto libXext
99
$(package)_build_subdir=qtbase
1010
$(package)_qt_libs=corelib network widgets gui plugins testlib
@@ -73,7 +73,7 @@ $(package)_config_opts += -prefix $(host_prefix)
7373
$(package)_config_opts += -qt-libpng
7474
$(package)_config_opts += -qt-libjpeg
7575
$(package)_config_opts += -qt-pcre
76-
$(package)_config_opts += -qt-zlib
76+
$(package)_config_opts += -system-zlib
7777
$(package)_config_opts += -reduce-exports
7878
$(package)_config_opts += -static
7979
$(package)_config_opts += -silent

depends/packages/zlib.mk

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package=zlib
2+
$(package)_version=1.2.11
3+
$(package)_download_path=http://www.zlib.net
4+
$(package)_file_name=$(package)-$($(package)_version).tar.gz
5+
$(package)_sha256_hash=c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
6+
7+
define $(package)_set_vars
8+
$(package)_build_opts= CC="$($(package)_cc)"
9+
$(package)_build_opts+=CFLAGS="$($(package)_cflags) $($(package)_cppflags) -fPIC"
10+
$(package)_build_opts+=AR="$($(package)_ar)"
11+
$(package)_build_opts+=RANLIB="$($(package)_ranlib)"
12+
endef
13+
14+
define $(package)_config_cmds
15+
./configure --static --prefix=$(host_prefix)
16+
endef
17+
18+
define $(package)_build_cmds
19+
$(MAKE) $($(package)_build_opts) libz.a
20+
endef
21+
22+
define $(package)_stage_cmds
23+
$(MAKE) DESTDIR=$($(package)_staging_dir) install $($(package)_build_opts)
24+
endef
25+

0 commit comments

Comments
 (0)