1.1 --- a/qt/qt.spec Wed Jun 08 21:12:01 2011 +0200
1.2 +++ b/qt/qt.spec Mon Jun 13 16:21:59 2011 +0200
1.3 @@ -166,10 +166,10 @@
1.4 -e 's;\(QT_CFLAGS_GLIB *=.*PKG_CONFIG.*\) --cflags-only-other ;\1 --cflags ;g' \
1.5 -e 's;\(QT_CFLAGS_QGTKSTYLE *=.*PKG_CONFIG.*\) --cflags-only-other ;\1 --cflags ;g' \
1.6 configure
1.7 -# MSvB In R/D: %{l_shtool} subst \
1.8 -# MSvB In R/D: -e 's;\(TRY_INCLUDEPATHS = \).*\(\$\$INCLUDEPATH\);\1\2;' \
1.9 -# MSvB In R/D: -e 's;/freetype2;/freetype;' \
1.10 -# MSvB In R/D: config.tests/unix/freetype/freetype.pri
1.11 + %{l_shtool} subst \
1.12 + -e 's;\(TRY_INCLUDEPATHS = \).*\(\$\$INCLUDEPATH\);\1\2;' \
1.13 + -e 's;/freetype2;/freetype;' \
1.14 + config.tests/unix/freetype/freetype.pri
1.15 # Trolltech Bug:
1.16 # /opdv/lib/libmng.a(libmng_cms.o): In function `mnglcms_initlibrary':
1.17 # libmng_cms.c:(.text+0xa): undefined reference to `cmsErrorAction'
1.18 @@ -276,14 +276,16 @@
1.19 %{l_shtool} subst \
1.20 -e 's;\(\$\$*\)\(QMAKE_LIBS_OPENVG\);\1\2 \1QMAKE_LIBS_THREAD;' \
1.21 config.tests/unix/openvg/openvg.pro
1.22 + echo 'QMAKE_LIBS_OPENVG = -lOpenVG' \
1.23 + >>mkspecs/common/unix.conf
1.24 %{l_shtool} subst \
1.25 -e "s;^\(QMAKE_INCDIR_X11[^=]*=\).*;\1 $x11_incdir;" \
1.26 -e "s;^\(QMAKE_LIBDIR_X11[^=]*=\).*;\1 $x11_libdir;" \
1.27 mkspecs/qws/*/qmake.conf \
1.28 mkspecs/*/qmake.conf
1.29 -# MSvB In R/D: %{l_shtool} subst \
1.30 -# MSvB In R/D: -e 's;^\(QMAKE_LIBS +=.*\);\1 -liconv;' \
1.31 -# MSvB In R/D: src/corelib/corelib.pro
1.32 + %{l_shtool} subst \
1.33 + -e 's;^\(QMAKE_LIBS +=.*\);\1 -liconv;' \
1.34 + src/corelib/corelib.pro
1.35 # Trolltech Bug:
1.36 # In file included from ../JavaScriptCore/runtime/RegExp.h:29:0,
1.37 # ../JavaScriptCore/yarr/RegexJIT.h: In destructor 'JSC::Yarr::RegexCodeBlock::~RegexCodeBlock()':
1.38 @@ -460,11 +462,23 @@
1.39 #-sm -xshape -xinerama -xcursor -xfixes -xrandr -tablet -xkb
1.40
1.41 # carry out shared build procedure
1.42 + # Trolltech Bug:
1.43 + # Problem with dependency order, causes compiling of source files
1.44 + # with unconfigured dependencies to other files to fail when
1.45 + # building the sources in parallel. The implemented work around
1.46 + # is disabling parallel make, causing a nearly 100% build deceleration.
1.47 + # itemviews/qlistview.cpp: In member function 'void QListModeViewBase::dragMoveEvent(QDragMoveEvent*)':
1.48 + # itemviews/qlistview.cpp:3134:1: internal compiler error: Segmentation fault
1.49 ( cd src
1.50 - %{l_make} %{l_mflags -O} \
1.51 + %{l_make} %{l_mflags} \
1.52 sub-moc sub-rcc sub-uic sub-uic3
1.53 ) || exit $?
1.54 - %{l_make} %{l_mflags -O} \
1.55 + # Trolltech Bug:
1.56 + # Problem with dependency order, causes compiling of source files
1.57 + # with unconfigured dependencies to other files to fail when
1.58 + # building the sources in parallel. The implemented work around
1.59 + # is disabling parallel make, causing a nearly 100% build deceleration.
1.60 + %{l_make} %{l_mflags} \
1.61 sub-corelib-make_default-ordered \
1.62 sub-xml-make_default-ordered \
1.63 sub-network-make_default-ordered \
1.64 @@ -601,7 +615,17 @@
1.65 sub-tools-make_default-ordered sub-translations-make_default-ordered
1.66 %endif
1.67 %if "%{with_examples}" == "yes"
1.68 - %{l_make} %{l_mflags -O} \
1.69 + # Trolltech Bug:
1.70 + # Another problem with dependency order with the same work around,
1.71 + # disabling parallel make and causing a nearly 100% build deceleration.
1.72 + # In file included from main.cpp:136:0:
1.73 + # .moc/release-static/main.moc:84:1: internal compiler error: Segmentation fault
1.74 + # Please submit a full bug report,
1.75 + # with preprocessed source if appropriate.
1.76 + # See <http://openpkg.org/> for instructions.
1.77 + # make[3]: *** [.obj/release-static/main.o] Error 1
1.78 + # make[2]: *** [sub-validators-make_default] Error 2
1.79 + %{l_make} %{l_mflags} \
1.80 sub-demos-make_default-ordered \
1.81 sub-examples-make_default-ordered
1.82 %endif
