Ver código fonte

Make even fatter (but more flexible) by installing plain libraries as well as multithreaded ones

Michael Schloh von Bennewitz 23 anos atrás
pai
commit
bd9866125d
1 arquivos alterados com 20 adições e 3 exclusões
  1. 20 3
      qt/qt.spec

+ 20 - 3
qt/qt.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [EVAL]
 Group:        XWindow
 License:      GPL
 Version:      3.1.1
-Release:      20030218
+Release:      20030226
 
 #   package options
 %option       with_xft    no
@@ -87,7 +87,7 @@ AutoReqProv:  no
         -docdir %{l_prefix}/share/qt/doc \
         -datadir %{l_prefix}/share/qt/data \
         -static -qt-gif -qt-zlib -platform $oscomp \
-        -thread -stl -qt-libpng -qt-libjpeg -qt-libmng \
+        -stl -qt-libpng -qt-libjpeg -qt-libmng \
 %if "%{with_xft}" == "yes"
         -xft
 %else
@@ -96,6 +96,23 @@ AutoReqProv:  no
 
     #   set $HOME to a writable directory for qsettings
     HOME=$PWD
+    %{l_make} %{l_mflags -O} \
+        MAKE="%{l_make} %{l_mflags -O}"
+
+    #   run configure a second time to get threaded libs, too
+    echo "yes" | ./configure \
+        -prefix %{l_prefix} \
+        -docdir %{l_prefix}/share/qt/doc \
+        -datadir %{l_prefix}/share/qt/data \
+        -static -qt-gif -qt-zlib -platform $oscomp \
+        -thread -stl -qt-libpng -qt-libjpeg -qt-libmng \
+%if "%{with_xft}" == "yes"
+        -xft
+%else
+        -no-xft
+%endif
+
+    #   make our targets a second time to get threaded libs, too
     %{l_make} %{l_mflags -O} \
         MAKE="%{l_make} %{l_mflags -O}" \
         symlinks src-qmake src-moc sub-src sub-tools
@@ -115,7 +132,7 @@ AutoReqProv:  no
         $RPM_BUILD_ROOT%{l_prefix}/share/qt/phrasebooks \
         $RPM_BUILD_ROOT%{l_prefix}/share/qt/images
 
-    #   copy binaries, headers, and then libraries to their target.
+    #   copy binaries, headers, and then libraries to their target
     %{l_shtool} install -c -s -m 755 \
         bin/qmake bin/moc bin/uic \
         bin/linguist bin/lrelease bin/lupdate \