The configure script assumes that gstreamer is the phonon backend
but ds9 is used for mingw32. This patch fixes this in the configure
script. We now invoke configure with -no-glib and -no-gstreamer.
Also fixed case of GL include directory reference.
Some syntactic improvements suggested upstream.
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.
-fixed compile test for win32-g++
-removed compile test hacks since compile test works now
-fixed odbc test for mingw32
-fixed iconv compile test for win32-g++
-fix ipv6 detection on win32-g++
-fix largefile detection on win32-g++
-fix getaddrinfo detection on win32-g++. Result is still
negative, apparently correctly.
-fix opengl detection on win32-g++
-removed obsolee opengl error hack
-improved exempting win32-g++ from XLib test
-improved zlib treatment when compiling on MAC for win32-g++
-finished rtti support
-restored replacement of -lz with -lQtCore4 on ssl.pri
-specifed "-no-fontcnfig" because this gets enabled now
by default thanks to working freetype detection.
-restored -openssl-linked, setting OPENSSL_LIBS and
zlib fix in ssl.pri. Previous conclusion that these
were unnecessary was apparently an experimental error.
glib is now detected which I hope is a good thing.
The postgresql library -lpq depends on -lsecure32, -lssl, and so
on. These are static libraries. When we build the psql plugin as
a shared library, linking fails unless we provide the list of
required libraries.
Previously, this was taken care of with a hack in the configure
script. Since that hack is not suitable for an upstream merge
request, I have moved it here.
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.
Previously we added support for postgresql+openssl in shared Qt by explicitly
linking to required libraries in psql.pro. However, we neglected to handle the
case of shared build of Qt with system-zlib, which requires -lz. This patch
takes care of -lz but also handles the situation more elegantly. Now we use
QT_LFLAGS_PSQL as intended. We set it in the configure script with help from
pkg-config for openssl dependencies. win32-g++ is now handled the unix way in
psql.pro. This is consistent with other zlib-related work. For non system-zlib
we remove the -lz.
Also, as of now qt-win32.patch is generated by git diff.
When building shared Qt plugin qsqlpsql, we have explicitly link to libraries
on which -lpq depends. Recently added OpenSSL support to PostgreSQL adds a few
more libraries.
* support for postgresql, tds and openssl
* fixed detection for float, zlib, libjpeg, libtiff, libmng,
libpng, postgresql, tds, sqlite, iconv,
STL, IPv6 and openssl
* added "-pipe" to CFLAGS to speed up build
Added support for compiler flag rtti to configure script. This was
already supported by the configure binary for Windows.
Fixed "detection" of mmx, 3dnow, sse, sse2, and rtti in configure
script for win32-g++ target.
Fixed failure to add a whole bunch of CONFIG options to qconfig.pri,
including but not limited to mmx, 3dnow, sse, sse2. I wonder if this was
a bug in the configure script. Now the CONFIG line looks more like the
one produced by the configure binary.
Volker Grabsch
Mark Brand