OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 01-Sep-2003 09:47:39
Branch: HEAD Handle: 2003090108473900
Modified files:
openpkg-src/qt qt.spec
Log:
Fix static and shared library building after last hammer job
Summary:
Revision Changes Path
1.80 +80 -17 openpkg-src/qt/qt.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.spec
============================================================================
$ cvs diff -u -r1.79 -r1.80 qt.spec
--- openpkg-src/qt/qt.spec 28 Aug 2003 17:01:59 -0000 1.79
+++ openpkg-src/qt/qt.spec 1 Sep 2003 07:47:39 -0000 1.80
@@ -33,7 +33,7 @@
Group: XWindow
License: GPL
Version: 3.2.1
-Release: 20030828
+Release: 20030901
# package options
%option with_pgsql no
@@ -79,9 +79,9 @@
%build
# display a warning that this package is a beast
- ( echo "This package requires about 1.3 GB of temporary disk space and"
- echo "about three hours of time (with gcc) to build on a 800Mhz system."
- echo "So be prepared and patient, please... ;-)"
+ ( echo "The qt package requires about 320 MB of temporary disk space"
+ echo "and two to four hours (depending on options) to build on a"
+ echo "800 MHz system. Therefore, please be prepared and be patient."
) | %{l_rpmtool} msg -b -t notice
# set HOME to a writable directory for qsettings
@@ -108,6 +108,7 @@
-e 's;%{l_prefix}/lib;%{l_prefix}/lib/qtdyn;g' \
-e 's;-L;-R;g'`
+%if "%{with_shared}" == "yes"
# special trolltech configuration
CC="%{l_cc}" \
CXX="%{l_cxx}" \
@@ -129,21 +130,88 @@
-plugindir %{l_prefix}/share/qt/plugins \
-translationdir %{l_prefix}/share/qt/translations \
-sysconfdir %{l_prefix}/etc/qt \
-%if "%{with_shared}" == "yes"
-release -static -shared -R$rflags -stl -sm \
-%else
- -release -static -stl -sm \
-%endif
-qt-zlib -qt-libpng -qt-libjpeg -qt-libmng -qt-gif \
-no-thread
+ # make shared libs, but tools will be built statically later
+ %{l_make} %{l_mflags -O} \
+ MAKE="%{l_make} %{l_mflags -O}" \
+ LD_LIBRARY_PATH=$QTDIR/lib \
+ sub-src sub-plugins
+
+ # keep only static library pkg-config build definitions
+ rm lib/qt.pc
+
+%if "%{with_threads}" == "yes"
+ # run configure a second time to get threaded libs as well
+ CC="%{l_cc}" \
+ CXX="%{l_cxx}" \
+ CFLAGS="%{l_cflags -O}" \
+ CXXFLAGS="%{l_cxxflags -O}" \
+ CPPFLAGS="%{l_cppflags}" \
+ LDFLAGS="%{l_ldflags}" \
+ echo "yes" | ./configure \
+%if "%{with_pgsql}" == "yes"
+ -qt-sql-psql \
+%endif
+%if "%{with_mysql}" == "yes"
+ -qt-sql-mysql \
+%endif
+ -platform $oscomp \
+ -prefix %{l_prefix} \
+ -docdir %{l_prefix}/share/qt/doc \
+ -datadir %{l_prefix}/share/qt/data \
+ -plugindir %{l_prefix}/share/qt/plugins \
+ -translationdir %{l_prefix}/share/qt/translations \
+ -sysconfdir %{l_prefix}/etc/qt \
+ -release -static -shared -R$rflags -stl -sm \
+ -qt-zlib -qt-libpng -qt-libjpeg -qt-libmng -qt-gif \
+ -thread
+
+ # make our targets a second time to get threaded libs, too
%{l_make} %{l_mflags -O} \
MAKE="%{l_make} %{l_mflags -O}" \
LD_LIBRARY_PATH=$QTDIR/lib \
+ sub-src sub-plugins
+
+ # keep only static library pkg-config build definitions
+ rm lib/qt-mt.pc
+%endif
+%endif
+
+ # start of static lib build
+ # special trolltech configuration
+ CC="%{l_cc}" \
+ CXX="%{l_cxx}" \
+ CFLAGS="%{l_cflags -O}" \
+ CXXFLAGS="%{l_cxxflags -O}" \
+ CPPFLAGS="%{l_cppflags}" \
+ LDFLAGS="%{l_ldflags}" \
+ echo "yes" | ./configure \
+%if "%{with_pgsql}" == "yes"
+ -qt-sql-psql \
+%endif
+%if "%{with_mysql}" == "yes"
+ -qt-sql-mysql \
+%endif
+ -platform $oscomp \
+ -prefix %{l_prefix} \
+ -docdir %{l_prefix}/share/qt/doc \
+ -datadir %{l_prefix}/share/qt/data \
+ -plugindir %{l_prefix}/share/qt/plugins \
+ -translationdir %{l_prefix}/share/qt/translations \
+ -sysconfdir %{l_prefix}/etc/qt \
+ -release -static -stl -sm \
+ -qt-zlib -qt-libpng -qt-libjpeg -qt-libmng -qt-gif \
+ -no-thread
+
+ %{l_make} %{l_mflags -O} \
+ MAKE="%{l_make} %{l_mflags -O}" \
%if "%{with_tools}" == "yes"
- symlinks src-qmake src-moc sub-src sub-plugins sub-tools
+ sub-src sub-tools
%else
- symlinks src-qmake src-moc sub-src sub-plugins
+ sub-src
( cd tools/designer
%{l_make} %{l_mflags -O} \
MAKE="%{l_make} %{l_mflags -O}" \
@@ -177,22 +245,17 @@
-plugindir %{l_prefix}/share/qt/plugins \
-translationdir %{l_prefix}/share/qt/translations \
-sysconfdir %{l_prefix}/etc/qt \
-%if "%{with_shared}" == "yes"
- -release -static -shared -R$rflags -stl -sm \
-%else
-release -static -stl -sm \
-%endif
-qt-zlib -qt-libpng -qt-libjpeg -qt-libmng -qt-gif \
-thread
# make our targets a second time to get threaded libs, too
%{l_make} %{l_mflags -O} \
MAKE="%{l_make} %{l_mflags -O}" \
- LD_LIBRARY_PATH=$QTDIR/lib \
%if "%{with_tools}" == "yes"
- symlinks src-qmake src-moc sub-src sub-plugins sub-tools
+ sub-src sub-tools
%else
- symlinks src-qmake src-moc sub-src sub-plugins
+ sub-src
( cd tools/designer
%{l_make} %{l_mflags -O} \
MAKE="%{l_make} %{l_mflags -O}" \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
