Lukas Oboril wrote:
>> On an unrelated issue but still regarding Qt/qmake, when building pyqt I
>> noticed that qmake.conf (in mkspecs/solaris-cc/qmake.conf) should know
>> about ${_foss_include}/stdcxx and ${_foss_include}/stdcxx/ansi.
>>
>> Here is a proposed fix for qmake.conf:
>> ===================================================================
>> --- QT/4.4.1/Solaris/configure.sh (revision 2799)
>> +++ QT/4.4.1/Solaris/configure.sh (working copy)
>> @@ -276,7 +276,7 @@
>>
>> chmod 0755 Solaris/create_qmake_conf.sh
>>
>> -./Solaris/create_qmake_conf.sh --conf=${QMAKE_CONF} --cc=$CC --cxx=$CXX
>> --cflags="$CFLAGS" --cxxflags="$CXXFLAGS" --cppflags="$CPPFLAGS"
>> --ldflags="$LDFLAGS" --extra-include=${_includedir} --extra-libs=${_libdir}
>> +./Solaris/create_qmake_conf.sh --conf=${QMAKE_CONF} --cc=$CC --cxx=$CXX
>> --cflags="$CFLAGS" --cxxflags="$CXXFLAGS" --cppflags="$CPPFLAGS"
>> --ldflags="$LDFLAGS" --extra-include="${_includedir}
>> ${_foss_include}/stdcxx/ansi ${_foss_include}/stdcxx"
>> --extra-libs=${_libdir}
>>
>> chmod 0755 configure
>>
>> @@ -362,8 +362,6 @@
>> -lX11 -lXext -lXi -lXt \
>> -D_REENTRANT -D_RWSTD_REENTRANT -DSOLARIS \
>> ${FLT_EVAL_METHOD} \
>> - -I${_foss_include}/stdcxx/ansi \
>> - -I${_foss_include}/stdcxx \
>> -I${_foss_include}/freetype2 \
>> -I${_foss_include}/fontconfig \
>> ${GLIB_CFLAGS} \
>>
>
> Adriaan, Stefan
>
> what do you think here ? I think that forst part of patch is
> reasonable, but second not.
Standard C++ Library header files should (and must) be set in $(CPPFLAGS) and
qmake.conf references $(CPPFLAGS) directly -- there's no need to add the
includes again.
--Stefan
--
Stefan Teleman
Sun Microsystems, Inc.
Stefan.Teleman at Sun.COM
