Changeset fcf217f

Timestamp:

Feb 21, 2006, 12:23:12 AM (19 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

e5345f18

Parents:

f118837

Message:

r602@server (orig r600): ryan | 2005-08-05 23:24:20 -0700
Script now uses defaults defined in qt-setup.sh
Has options to build against mysql,pgsql and unixodbc
Fixed some indentation...

File:

• scripts/untested/blfs-scripts/blfs-qt.sh (modified) (8 diffs)

scripts/untested/blfs-scripts/blfs-qt.sh

@@ -2 +2 @@
 
 ### qt ###
-
 cd ${SRC}
 LOG=qt-blfs.log
@@ -10 +9 @@
 set_libdirname
 setup_multiarch
+
+# qt-setup.sh should have been sourced 
+#QT_INSTALL_SELF_CONTAINED=Y
+#USE_MYSQL=Y
+#USE_PGSQL=Y
+#USE_UNIXODBC=Y
 
 if [ "Y" = "${QT_INSTALL_SELF_CONTAINED}" ]; then
@@ -33 +38 @@
 fi
 
-unpack_tarball qt-${QT_VER}
+if [ "${USE_MYSQL}" = "Y" ]; then
+   extra_conf="${extra_conf} -plugin-sql-mysql $( mysql_config --include )"
+   echo extra_conf
+fi
+
+
+if [ "${USE_POSTGRES}" = "Y" ]; then
+   extra_conf="${extra_conf} -plugin-sql-psql -I$( pg_config --includedir )"
+fi
+
+if [ "${USE_ODBC}" = "Y" ]; then
+   extra_conf="${extra_conf} -plugin-sql-odbc -I/usr/include"
+fi
+
+unpack_tarball qt-x11-free-${QT_VER}
 cd ${PKGDIR}
 
 # Here we have to handle lib / lib64 , and also handle multilib compilers
-if [ "Y" = "${BIARCH}" ]; then
+if [ "Y" = "${MULTIARCH}" ]; then
    platform="linux-g++"
    if [ "${libdirname}" = "lib64" ]; then platform="linux-g++-64" ; fi
@@ -45 +64 @@
    mkspecs/${platform}/qmake.conf
 
+# Force removal of existing file when installing
+echo "QMAKE_INSTALL_FILE      = cp --remove-destination" \
+   >> mkspecs/${platform}/qmake.conf
+sed -i -e 's@cp -f@cp --remove-destination@g' \
+   qmake/Makefile.unix
+
 extra_conf="${extra_conf} -platform ${platform}"
+
+export QTDIR="${SRC}/${PKGDIR}"
+export LD_LIBRARY_PATH="${QTDIR}/lib:${LD_LIBRARY_PATH}" 
+export PATH=${QTDIR}/bin:${PATH}
 
 max_log_init qt ${QT_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
@@ -52 +81 @@
    -no-exceptions -thread -plugin-imgfmt-png \
    -system-libpng -system-libmng -system-zlib -system-libjpeg \
-   -system-nas-sound -qt-gif \
+   -system-nas-sound -qt-gif -tablet \
    >> ${LOGFILE} 2>&1 &&
-echo " o Configure OK" &&
+echo " o Configure OK" || barf
 
 min_log_init ${BUILDLOGS} &&
 make \
    >> ${LOGFILE} 2>&1 &&
-echo " o Build OK" &&
+echo " o Build OK" || barf
 
 if [ "Y" = "${MULTIARCH}" ]; then
@@ -65 +94 @@
    # qt platform during install
    case ${platform} in
-   linux-g++ )
-      if [ -d ${qtprefix}/mkspecs/linux-g++-64 ];then
-         mv ${qtprefix}/mkspecs/linux-g++-64 \
-            ${qtprefix}/mkspecs/linux-g++-64-ORIG
-      fi
-   linux-g++-64 )
-      if [ -d ${qtprefix}/mkspecs/linux-g++ ];then
-         mv ${qtprefix}/mkspecs/linux-g++ \
-            ${qtprefix}/mkspecs/linux-g++-ORIG
-      fi
+      linux-g++ )
+         if [ -d ${qtprefix}/mkspecs/linux-g++-64 ];then
+            mv ${qtprefix}/mkspecs/linux-g++-64 \
+               ${qtprefix}/mkspecs/linux-g++-64-ORIG
+         fi
+      ;;
+      linux-g++-64 )
+         if [ -d ${qtprefix}/mkspecs/linux-g++ ];then
+            mv ${qtprefix}/mkspecs/linux-g++ \
+               ${qtprefix}/mkspecs/linux-g++-ORIG
+         fi
+      ;;
    esac
 fi
@@ -85 +116 @@
 if [ "Y" = "${MULTIARCH}" ]; then
    case ${platform} in
-   linux-g++ )
-      if [ -d ${qtprefix}/mkspecs/linux-g++-64-ORIG ];then
-         rm -rf ${qtprefix}/mkspecs/linux-g++-64
-         mv ${qtprefix}/mkspecs/linux-g++-64-ORIG \
-            ${qtprefix}/mkspecs/linux-g++-64
-      fi
-   linux-g++-64 )
-      if [ -d ${qtprefix}/mkspecs/linux-g++-ORIG ];then
-         rm -rf ${qtprefix}/mkspecs/linux-g++
-         mv ${qtprefix}/mkspecs/linux-g++-ORIG \
-            ${qtprefix}/mkspecs/linux-g++
-      fi
+      linux-g++ )
+         if [ -d ${qtprefix}/mkspecs/linux-g++-64-ORIG ];then
+            rm -rf ${qtprefix}/mkspecs/linux-g++-64
+            mv ${qtprefix}/mkspecs/linux-g++-64-ORIG \
+               ${qtprefix}/mkspecs/linux-g++-64
+         fi
+      ;;
+      linux-g++-64 )
+         if [ -d ${qtprefix}/mkspecs/linux-g++-ORIG ];then
+            rm -rf ${qtprefix}/mkspecs/linux-g++
+            mv ${qtprefix}/mkspecs/linux-g++-ORIG \
+               ${qtprefix}/mkspecs/linux-g++
+         fi
+      ;;
    esac
 fi
@@ -120 +153 @@
    # for the given architecture ). Here we move it to a subdir and
    # create a stub header
-   create_stub_hdrs ${qtincludedir}/qconfig.h
+   create_stub_hdrs ${qtheaderdir}/qconfig.h
 fi