diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2010-02-21 10:14:53 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2010-02-21 10:14:53 (GMT) |
| commit | 7f68c53a0bef8ab59bf45a05c75c95a61ebb65d3 (patch) | |
| tree | c5d06c97702b6211ea1139f31ba62749948a99d6 /src/qt.mk | |
| parent | ac9c34385720e16340f0e7c42ed82a7af5be610b (diff) | |
| download | mxe-7f68c53a0bef8ab59bf45a05c75c95a61ebb65d3.zip mxe-7f68c53a0bef8ab59bf45a05c75c95a61ebb65d3.tar.gz mxe-7f68c53a0bef8ab59bf45a05c75c95a61ebb65d3.tar.bz2 | |
do not introduce QtCore4 in ssl.pri
It is not correct to add QtCore4 in ssl.pri when -lz is removed
for qt-zlib.
In mingw-cross-env we add QtCore4 to OPENSSL_LIBS so the zlib
dependency of openssl is satisfied in case of qt-zlib. This
is necessary for the time being because the QtCore4 in the link
command that qmake generates appears before the contents of
OPENSSL_LIBS.
Diffstat (limited to 'src/qt.mk')
| -rw-r--r-- | src/qt.mk | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -93,9 +93,11 @@ define $(PKG)_BUILD # We prefer static mingw-cross-env system libs for static build: # -system-zlib -system-libpng -system-libjpeg -system-libtiff -system-libmng -system-sqlite # There is no -system-gif option. NB -system-libmng will not link in shared build. - # Linking PSQL shared plugin requires PSQL_LIBS. Harmless for static build. + # Linking QtNetwork4.dll requires OPENSSL_LIBS. Harmless for static build. + # QtCore4 provides qt-zlib to openssl. Harmless for system-zlib. + # Linking qsqlpsql4.dll plugin requires PSQL_LIBS. Harmless for static build. cd '$(1)' && \ - OPENSSL_LIBS="`'$(TARGET)-pkg-config' --libs-only-l openssl`" \ + OPENSSL_LIBS="`'$(TARGET)-pkg-config' --libs-only-l openssl` -lQtCore4" \ PSQL_LIBS="-lpq -lsecur32 `'$(TARGET)-pkg-config' --libs-only-l openssl`" ./configure \ -opensource \ -confirm-license \ |