diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2010-02-26 15:56:01 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2010-02-26 15:56:01 (GMT) |
| commit | adbf2733ce8e9f3851a0f39bc5ae928990c29e97 (patch) | |
| tree | 70327277f8fc0207d848e09b831d130dfb5187c7 /src | |
| parent | ad894eaa632b4f34bff5f61dc7173a89494e882d (diff) | |
| download | mxe-adbf2733ce8e9f3851a0f39bc5ae928990c29e97.zip mxe-adbf2733ce8e9f3851a0f39bc5ae928990c29e97.tar.gz mxe-adbf2733ce8e9f3851a0f39bc5ae928990c29e97.tar.bz2 | |
do not add QtCore4 to OPENSSL_LIBS for static builds of package qt
I assumed that having -lQtCore4 in OPENSSL_LIBS was harmless for
static Qt. That is false. Although building Qt succeeds, this
also causes an application's makefile generated by qmake to mention
-lQtCore4. For static Qt, the actual library is called "libQtCore.a"
(without the "4"), which caueses linking to fail.
Therefore, I removed this library from OPENSSL_LIBS and included
a reminder for people who want to build shared Qt with qt-zlib.
Also, OPENSSL_LIBS and PSQL_LIBS are probably more than "harmless"
for static Qt. They help qmake generate appropriate makefiles
for applications.
Diffstat (limited to 'src')
| -rw-r--r-- | src/qt.mk | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -93,11 +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 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. + # Linking QtNetwork4.dll requires OPENSSL_LIBS as does linking apps with static Qt. + # Linking qsqlpsql4.dll plugin requires PSQL_LIBS as does linking apps with static Qt. + # For shared Qt with qt-zlib, add -lQtCore4 to end of OPENSSL_LIBS to satisfy zlib dependency. cd '$(1)' && \ - OPENSSL_LIBS="`'$(TARGET)-pkg-config' --libs-only-l openssl` -lQtCore4" \ + OPENSSL_LIBS="`'$(TARGET)-pkg-config' --libs-only-l openssl`" \ PSQL_LIBS="-lpq -lsecur32 `'$(TARGET)-pkg-config' --libs-only-l openssl`" ./configure \ -opensource \ -confirm-license \ |