Author: glen Date: Tue Feb 16 21:10:21 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- update build flags so that -debuginfo contains anything useful
---- Files affected:
packages/qt:
qt.spec (1.399 -> 1.400)
---- Diffs:
================================================================
Index: packages/qt/qt.spec
diff -u packages/qt/qt.spec:1.399 packages/qt/qt.spec:1.400
--- packages/qt/qt.spec:1.399 Tue Feb 16 17:23:16 2010
+++ packages/qt/qt.spec Tue Feb 16 22:10:16 2010
@@ -749,33 +749,30 @@
# change QMAKE_CFLAGS_RELEASE to build
# properly optimized libs
-plik="mkspecs/linux-g++/qmake.conf"
-
-perl -pi -e "
- s|QMAKE_CC.*=.*gcc|QMAKE_CC = %{__cc}|;
- s|QMAKE_CXX.*=.*g\+\+|QMAKE_CXX = %{__cxx}|;
+cp mkspecs/linux-g++/qmake.conf{,.orig}
+%{__sed} -i -e '
s|/usr/lib|%{_libdir}|;
s|/usr/X11R6/lib|/usr/%{_lib}|;
s|/usr/X11R6/include|/usr/include|;
- s|\\(QTDIR\\)/lib|\\(QTDIR\\)/%{_lib}|;
- " $plik
-
-cat $plik \
- |grep -v QMAKE_CFLAGS_RELEASE \
- |grep -v QMAKE_CXXFLAGS_RELEASE \
- |grep -v QMAKE_CFLAGS_DEBUG \
- |grep -v QMAKE_CXXFLAGS_DEBUG \
- > $plik.1
-
-mv $plik.1 $plik
-echo >> $plik
-echo -e "QMAKE_CFLAGS_RELEASE\t=\t%{rpmcflags}" >> $plik
-echo -e "QMAKE_CXXFLAGS_RELEASE\t=\t%{rpmcxxflags}" >> $plik
-echo -e "QMAKE_CFLAGS_DEBUG\t=\t%{debugcflags}" >> $plik
-echo -e "QMAKE_CXXFLAGS_DEBUG\t=\t%{debugcflags}" >> $plik
+ s|\(QTDIR\)/lib|\(QTDIR\)/%{_lib}|;
+ s|QMAKE_RPATH\s*=.*|QMAKE_RPATH =|
+ s|QMAKE_STRIP\s*=.*|QMAKE_STRIP =|
+ s|QMAKE_STRIPFLAGS_LIB\s*+=.*|QMAKE_STRIPFLAGS_LIB =|
+ s|QMAKE_LINK\s*=.*g++|QMAKE_LINK = %{__cxx}|
+ s|QMAKE_LINK_SHLIB\s*=.*g++|QMAKE_LINK_SHLIB = %{__cxx}|
+ s|QMAKE_CC\s*=.*gcc|QMAKE_CC = %{__cc}|
+ s|QMAKE_CXX\s*=.*g++|QMAKE_CXX = %{__cxx}|
+ s|QMAKE_CFLAGS\s*=.*-pipe|QMAKE_CFLAGS\t=\t%{rpmcflags} -pipe|
+ s|QMAKE_CFLAGS_RELEASE\s*=.*|QMAKE_CFLAGS_RELEASE\t=\t%{rpmcflags}|
+ s|QMAKE_CFLAGS_DEBUG\s*=.*|QMAKE_CFLAGS_DEBUG\t=\t%{debugcflags}|
+
s|QMAKE_CXXFLAGS_RELEASE\s*=.*|QMAKE_CXXFLAGS_RELEASE\t=\t%{rpmcxxflags}|
+ s|QMAKE_CXXFLAGS_DEBUG\s*=.*|QMAKE_CXXFLAGS_DEBUG\t=\t%{debugcflags}|
+ s|QMAKE_LFLAGS_RELEASE\s*=.*|QMAKE_LFLAGS_RELEASE\t=\t%{rpmldflags}|
+ s|QMAKE_LFLAGS_DEBUG\s*=.*|QMAKE_LFLAGS_DEBUG\t=\t%{rpmldflags}|
+ ' mkspecs/linux-g++/qmake.conf
%build
-export QTDIR=`/bin/pwd`
+export QTDIR=$(pwd)
export PATH=$QTDIR/bin:$PATH
export LD_LIBRARY_PATH=$QTDIR/%{_lib}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
@@ -1332,6 +1329,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.400 2010/02/16 21:10:16 glen
+- update build flags so that -debuginfo contains anything useful
+
Revision 1.399 2010/02/16 16:23:16 glen
- package ghost soname symlinks
- preserve file timestamps, cleanups
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qt/qt.spec?r1=1.399&r2=1.400&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
