mirror of https://git.wownero.com/dsc/mxe.git
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.
This commit is contained in:
parent
ad894eaa63
commit
adbf2733ce
|
@ -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 \
|
||||
|
|
Loading…
Reference in New Issue