Changeset 300656b for scripts

Timestamp:

Feb 21, 2006, 12:18:26 AM (18 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:

b67b7ca

Parents:

5baad6a

Message:

r585@server (orig r583): ryan | 2005-08-05 21:47:55 -0700
Update all kde build scripts... tested and working on bi-arch amd64

Location:

scripts/untested/kde-scripts

Files:

• kde-arts.sh (modified) (2 diffs)
• kde-kde-base.sh (modified) (1 diff)
• kde-kde-libs.sh (modified) (3 diffs)
• kde-packages (added)
• kde-setup.sh (modified) (1 diff)

scripts/untested/kde-scripts/kde-arts.sh

@@ -13 +13 @@
 fi
 
+# override TARBALLS to point at kde tree
+export TARBALLS=${KDE_TARBALLS}/stable/${KDE_VER}/src
 unpack_tarball arts-${ARTS_VER}
 cd ${PKGDIR}
@@ -30 +32 @@
 make ${PMFLAGS} \
    >> ${LOGFILE} 2>&1 &&
-echo " o Build OK" &&
+echo " o Build OK" || barf
 
 min_log_init ${TESTLOGS} &&
-make check \
+make -k check \
    >> ${LOGFILE} 2>&1 &&
 echo " o Test OK" || errmsg

scripts/untested/kde-scripts/kde-kde-base.sh

@@ -44 +44 @@
 
 min_log_init ${INSTLOGS} &&
-make install \
+make DESTDIR=/opt/${PKGDIR}-${BUILDENV} install \
    >> ${LOGFILE} 2>&1 &&
 echo " o ALL OK" || barf

scripts/untested/kde-scripts/kde-kde-libs.sh

@@ -34 +34 @@
 esac
 
+# fast-malloc only works on i?86 ...
+#   --enable-fast-malloc=full \
 max_log_init kdelibs ${KDELIBS_VER} "kde (shared)" ${CONFLOGS} ${LOG}
 CC="${CC-gcc} ${ARCH_CFLAGS}" \
@@ -41 +43 @@
 ./configure --prefix=${KDE_PREFIX} ${extra_conf} \
    --disable-debug --disable-dependency-tracking \
-   --enable-fast-malloc=full \
    --with-qt-libraries=/opt/qt/${libdirname} \
    >> ${LOGFILE} 2>&1 &&
@@ -61 +62 @@
 echo " o ALL OK" || barf
 
+if [ "${MULTIARCH}" = "Y" ]; then
+   use_wrapper ${KDE_PREFIX}/bin/kde-config
+fi

scripts/untested/kde-scripts/kde-setup.sh

@@ -4 +4 @@
 
 mkdir -p /opt/kde-${KDE_VER}
+ln -sfn kde-${KDE_VER} /opt/kde
 
-export KDE_PREFIX=/opt/kde-${KDE_MAJ}
+export KDE_PREFIX=/opt/kde-${KDE_VER}
 
 export PATH=${PATH}:${KDE_PREFIX}/bin
-export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${KDE_PREFIX}/lib/pkgconfig
+export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${KDE_PREFIX}/${libdirname}/pkgconfig
 
-grep ${KDE_PREFIX}/${libdir} /etc/ld.so.conf > /dev/null 2>&1 ||
-   echo "${KDE_PREFIX}/${libdir}" >> /etc/ld.so.conf
+grep ${KDE_PREFIX}/${libdirname} /etc/ld.so.conf > /dev/null 2>&1 ||
+   echo "${KDE_PREFIX}/${libdirname}" >> /etc/ld.so.conf
 
 grep ${KDE_PREFIX}/man /etc/man.conf > /dev/null 2>&1 ||