d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,861 Commits 5 Branches 36 Tags 33 MiB
Commit Graph

139 Commits

Author SHA1 Message Date
Volker Grabsch 46d40c81c2 use the correct pg_config tool in package qt 2010-02-20 05:23:09 +01:00
Mark Brand 03dbabd8f4 bugfix: use backquotes instead of $(shell ...) in the build rules of package qt 2010-02-18 09:16:33 +01:00
Mark Brand 902b61d8bc fixed dependencies for the shared psql plugin in package qt 
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.
 2010-02-18 01:56:41 +01:00
Mark Brand 4325746a51 revert openssl hacks in configure and use pg_config in package qt 2010-02-17 21:57:56 +01:00
Mark Brand 754f8ef7c3 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.
 2010-02-17 16:56:48 +01:00
Volker Grabsch e1ab4466ff changed coding style: make "-i" always the first argument of $(SED) (by Mark Brand) 2010-02-16 04:12:53 +01:00
Mark Brand 1ec507a833 update package qt 2010-02-15 21:37:49 +01:00
Volker Grabsch 71f83a7e0d point consequently to "doc/index.html" instead of "doc/index.html or doc/README" 2010-02-08 00:58:06 +01:00
Volker Grabsch 4a1e1b1fcb test program for package qt 2010-01-23 00:07:21 +01:00
Volker Grabsch feccf81bb9 improved escaping in the build rules of package qt 2010-01-23 00:05:23 +01:00
Mark Brand b9a06d261a update version of package qt 2010-01-21 02:02:05 +01:00
Volker Grabsch 8a3233b044 simplified file markers 2010-01-16 23:02:02 +01:00
Volker Grabsch f09cef0d57 improvements for package qt (by Mark Brand) 2009-12-06 12:07:15 +01:00
Volker Grabsch a1a368e269 some more improvements for package qt (by Mark Brand) 2009-12-04 22:24:17 +01:00
Volker Grabsch c7935a172b various improvements for package qt (by Mark Brand) 2009-12-04 04:36:14 +01:00
Volker Grabsch 4d36c5a103 use more external libraries in package qt (by Mark Brand) 2009-12-03 11:36:44 +01:00
Volker Grabsch 5e5d515eda avoid tp/beta/rc/... versions of package qt 2009-12-02 17:38:17 +01:00
Volker Grabsch d6f8aae3f5 update version of package qt (by Mark Brand) 2009-12-02 13:07:46 +01:00
Volker Grabsch 567a33ff54 several improvements to package qt (by Mark Brand) 
* 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
 2009-11-12 03:15:35 +01:00
Volker Grabsch 4574ae8332 add ODBC support to package qt (by Mark Brand) 2009-10-28 13:37:52 +01:00
Volker Grabsch bc9b42e5a9 ignore technology previews of package qt 2009-10-27 23:38:37 +01:00
Volker Grabsch e01ee26288 enable sqlite support in package qt 2009-10-27 18:05:29 +01:00
Volker Grabsch 47bab4834c update version of package qt (by Mark Brand) 2009-10-27 17:54:54 +01:00
Volker Grabsch 210ba18832 disabled WebKit because of problems with FreeBSD in package qt 2009-10-19 10:34:29 +02:00
Volker Grabsch af8eb115ea disable sql and sqlite support in package qt 2009-10-16 22:23:56 +02:00
Volker Grabsch 077e586576 avoid external libraries in package qt, because qt doesn't set their "LIBS=..." flags properly 2009-10-10 15:25:40 +02:00
Volker Grabsch 7a2aa945a2 re-enable an important workaround in package qt 2009-10-10 14:22:39 +02:00
Volker Grabsch bd936fb838 disable debug information for package qt 2009-10-10 14:04:22 +02:00
Volker Grabsch 0491238a1a removed a workaround which is no longer needed at that place in package qt (by Tony Theodore) 2009-10-10 12:22:20 +02:00
Volker Grabsch 1328479859 portability fix for MacOS X for package qt 2009-10-10 04:15:53 +02:00
Volker Grabsch c91dc85468 refer to external helper libraries in package qt 2009-10-09 17:16:40 +02:00
Volker Grabsch fbbab1d70c workaround for a build problem on Solaris of package qt 2009-10-08 23:06:06 +02:00
Volker Grabsch 6e1a67a02b more bugfixes for package qt 2009-10-06 14:08:28 +02:00
Volker Grabsch 09d2c910d8 add OpenGL support to package qt (by Martin Lambers) 2009-10-06 12:17:40 +02:00
Volker Grabsch 80dcaeb894 build the native Qt tools from unpatched sources 2009-10-05 10:43:48 +02:00
Volker Grabsch 4e6cfe8028 simplify the native build in package qt 2009-10-04 21:59:11 +02:00
Volker Grabsch 28aecafe83 several bugfixes for package qt to ensure that "i686-pc-mingw32-qmake ; make" will work 2009-10-04 03:29:37 +02:00
Volker Grabsch f810f36d84 adjusted package qt to the current coding style 2009-10-03 23:04:13 +02:00
Volker Grabsch a77ec8199f new package: qt (by Mark Brand) 2009-10-03 21:11:16 +02:00