aszlig
fb74d901d7
boost: Add patch for mingw to use gas instead.
...
The upstream sources only compile with masm, so we need to add a patch
that translates the masm sources to GNU assembler. Unfortunately, this
means, that "generic.nix" is no longer very much generic, but the
versions we currently include work fine with the patch.
Unfortunately, the boost build still doesn't finish, but we're getting
there soon enough.
The patch is from https://svn.boost.org/trac/boost/ticket/7262 and
following the discussion it seems that the upstream authors are
unwilling to add a gas version for the Windows platform. So in the long
term we might need to find a better solution to that, like for example
using Wine to run MASM.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-23 10:52:07 +02:00
aszlig
5f0f48c08b
boost: Reduce noise during cross compile.
...
I guess the "set -x" was only left there for debugging, so I'm removing
it because it let's the scrollback buffer explode ;-)
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-23 10:52:06 +02:00
aszlig
2d760a28b3
boost: Supply some configure flags for mingw.
...
Otherwise, Boost.Build is trying to compile against pthread and
desperately searches for icu/iconv.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-23 10:52:06 +02:00
aszlig
ad033f7665
boost: Fix generation of crossB2Args.
...
`concatMapStringsSep` actually needs a function to work on the list
items, but it was probably a leftover from the refactor in af8654d
.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-23 10:52:06 +02:00
Vladimír Čunát
960244c0af
poppler: improve on mingw
...
The minimal version should be fine now.
2016-04-23 10:52:05 +02:00
Vladimír Čunát
076a09ee37
poppler: disable some dependencies for minimal config
...
lcms, openjpeg and curl don't seem to be so necessary.
2016-04-23 10:52:05 +02:00
Vladimír Čunát
7d4ebb526c
libjpeg(-turbo): fix on mingw
...
By porting a patch from msys2.
2016-04-23 10:52:04 +02:00
Vladimír Čunát
bd3d377e5e
freetype: fix on mingw
2016-04-23 10:52:04 +02:00
Vladimír Čunát
321ecde8a1
zlib: on mingw, add another DLL link
...
Also clean up the expression a little.
It fixes at least libpng's DLL.
2016-04-23 10:52:03 +02:00
Vladimír Čunát
80509ab287
libpng: fix on mingw by disabling doCheck
2016-04-23 10:52:03 +02:00
Vladimír Čunát
49bec81730
libxslt: fix on mingw by upstream patch
...
It's only static, as libxml2 is only static ATM.
2016-04-23 10:52:03 +02:00
Vladimír Čunát
94eba25103
libxml2: fix on mingw, without DLLs ATM
...
After closure-size merge we need to disable python support,
as python upstream doesn't support cross-building linux -> mingw.
2016-04-23 10:52:02 +02:00
Vladimír Čunát
afaf1c2f77
gettext: remove crossAttrs
...
They seem not needed anymore.
2016-04-23 10:52:00 +02:00
Vladimír Čunát
a047ba25f4
libiconv: fix on mingw
2016-04-21 13:25:33 +02:00
Thomas Tuegel
9ea3e371df
qt5: handle dev output even without qmake
2016-04-21 04:57:01 -05:00
Nikolay Amiantov
039ff272ee
qt55: remove configureScript from qt5Submodule
2016-04-20 19:02:13 +03:00
Nikolay Amiantov
f3e8653647
valkyrie: move to qmake4Hook
2016-04-20 18:55:54 +03:00
Nikolay Amiantov
a9662f8c45
qtcreator: move to qmakeHook
2016-04-20 18:55:53 +03:00
Nikolay Amiantov
c161258003
pyqt5: move to qmakeHook
...
This reverts commit f1c2572479
.
2016-04-20 18:55:53 +03:00
Nikolay Amiantov
79008f6095
signon: move to qmakeHook
...
This reverts commit 96bed5b7aa
.
2016-04-20 18:55:53 +03:00
Nikolay Amiantov
1b032e5221
qwt: move to qmake4Hook
2016-04-20 18:55:53 +03:00
Nikolay Amiantov
d441238b52
qt5.qwt: move to qmakeHook
...
This reverts commit 8779e0f274
.
2016-04-20 18:55:53 +03:00
Nikolay Amiantov
82af8640e3
quazip: move to qmakeHook
...
This reverts commit d663b3df24
.
2016-04-20 18:55:52 +03:00
Nikolay Amiantov
1875538730
qtscriptgenerator: spaces
2016-04-20 18:55:52 +03:00
Nikolay Amiantov
5b17e82559
qt55.qtmultimedia: use qmakeFlags
2016-04-20 18:55:52 +03:00
Nikolay Amiantov
4a4567b731
qt54.qtmultimedia: use qmakeFlags
2016-04-20 18:55:52 +03:00
Nikolay Amiantov
b69940ee76
qscintilla: move to qmake4Hook
2016-04-20 18:55:52 +03:00
Nikolay Amiantov
e307c3dac2
qoauth: move to qmake4Hook
2016-04-20 18:55:51 +03:00
Nikolay Amiantov
005dab1a7a
qmltermwidget: move to qmakeHook
...
This reverts commit 2d6ea2cc30
.
2016-04-20 18:55:51 +03:00
Nikolay Amiantov
49558b04d2
liqglviewer: move to qmake4Hook
2016-04-20 18:55:51 +03:00
Nikolay Amiantov
9a2bd51a30
libkeyfinder: move to qmakeHook
...
This reverts commit f43d8b2336
.
2016-04-20 18:55:51 +03:00
Nikolay Amiantov
ac1a531933
libcommuni: move to qmakeHook
...
This reverts commit ee1af147f3
.
2016-04-20 18:55:51 +03:00
Nikolay Amiantov
4b5bf1916a
herqq: move to qmake4Hook
2016-04-20 18:55:51 +03:00
Nikolay Amiantov
068c7b68a2
accounts-qt: move to qmakeHook
...
This reverts commit 25382a37e3
.
2016-04-20 18:55:50 +03:00
Nikolay Amiantov
31d6dd6be0
CGAL: fix build
2016-04-20 18:55:50 +03:00
Nikolay Amiantov
ba52751157
eql: flags is a list of strings
2016-04-20 18:55:50 +03:00
Nikolay Amiantov
b857459bdb
qt5.qmakeHook: init, move from qtbase's setup hook
2016-04-20 18:55:37 +03:00
Nikolay Amiantov
065a7515a7
qmake4Hook: init
2016-04-20 18:48:01 +03:00
Thomas Tuegel
3ecbb214b6
phonon: fix evaluation error
2016-04-20 10:15:10 -05:00
Thomas Tuegel
01b171c877
phonon: fix build after cmake setup hook changes
2016-04-20 10:01:06 -05:00
Thomas Tuegel
491f7f017c
cmake: set LIBDIR and INCLUDEDIR for multiple outputs
2016-04-20 10:01:06 -05:00
Thomas Tuegel
d088e0621e
dbus: 1.8.20 -> 1.10.8
2016-04-20 10:01:06 -05:00
Thomas Tuegel
924c0d34e7
qt55.polkit-qt: set CMAKE_INSTALL_INCLUDEDIR
2016-04-20 10:01:06 -05:00
Thomas Tuegel
afef9d4b0a
polkit-qt-1: separate Qt 4 and Qt 5 versions
2016-04-20 10:01:06 -05:00
Thomas Tuegel
40ebe0bad3
qt55.polkit-qt: use multiple outputs
2016-04-20 10:01:06 -05:00
Thomas Tuegel
84a83feb4d
qt55.qtbase: do not link $out/lib into $dev/
2016-04-20 10:01:06 -05:00
Thomas Tuegel
d5c100dc21
makeQtWrapper: defer environment settings to prePhases
2016-04-20 10:01:06 -05:00
Thomas Tuegel
8727485e08
qt55.qtbase: canonicalize paths in addToSearchPathOnce
2016-04-20 10:01:06 -05:00
Thomas Tuegel
51fe07711f
qt55.qtbase: disable plugin path debugging
2016-04-20 10:01:06 -05:00
Thomas Tuegel
35f9c58206
qt55.qtquick1: get import paths from NIX_PROFILES
2016-04-20 10:01:06 -05:00