summaryrefslogtreecommitdiffstats
path: root/src/qt.mk
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2010-02-17 15:56:48 (GMT)
committerMark Brand <mabrand@mabrand.nl>2010-02-17 15:56:48 (GMT)
commit754f8ef7c327378ee4f1d15c0a391d56ca71365c (patch)
treea2eaa31f3eb7a5cbf22b0cf91f8035b3e10e63e1 /src/qt.mk
parent644262b03338e2a4e93b1c9b40b3e77a925a0864 (diff)
downloadmxe-754f8ef7c327378ee4f1d15c0a391d56ca71365c.zip
mxe-754f8ef7c327378ee4f1d15c0a391d56ca71365c.tar.gz
mxe-754f8ef7c327378ee4f1d15c0a391d56ca71365c.tar.bz2
simplified linking to openssl in package qt
We have been building Qt with "-openssl-linked". A patch was needed to adjust OPENSSL_LIBS to keep a shared Qt build from failing at the point where QtNetwork4.dll is linked. The patch is not needed if we use "-openssl" instead. Because libssl and its dependencies are static libraries in mingw-cross-env, a simple "-openssl" also causes libssl and dependencies to be embedded (imported) into QNetwork4.dll, but it does so without requiring the patch. Details: The patch solved a problem that is a feature of a specific recipe of Qt build ingredients: (1) -shared (2) -openssl-linked (3) -qt-zlib in an environment were: (4) openssl is static (5) “system” zlib is static At least 1-3 are needed to see the problem. I suspect that 4 and 5 are needed as well. What I think I understand: “-shared” means that QtNetwork4.dll will be built, which is the locus of the problem. “-openssl-linked” means that libssl and its dependencies are to be embedded in QtNetwork4.dll. OPENSSL_LIBS supplies the list of dependencies. “-qt-zlib” means that QtCore4 contains a zlib implementation. Given this recipe for QtNetwork4.dll, the zlib implementation of “-lz” conflicts with the zlib implementation of “-lQtCore4”. The patch removed "-lz" from OPENSSL_LIBS and replaced it with "-lQtCore" in the same position. Adding "-lQtCore" in this way is not a robust solution. For example, it will break a debug build.
Diffstat (limited to 'src/qt.mk')
-rw-r--r--src/qt.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qt.mk b/src/qt.mk
index 580faea..32215e1 100644
--- a/src/qt.mk
+++ b/src/qt.mk
@@ -128,7 +128,7 @@ define $(PKG)_BUILD
-system-libmng \
-system-sqlite \
-qt-gif \
- -openssl-linked \
+ -openssl \
-v
$(MAKE) -C '$(1)' -j '$(JOBS)'