Changeset 236a72e

Timestamp:

Feb 21, 2006, 12:22:58 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:

f118837

Parents:

4e71b7e

Message:

r600@server (orig r598): ryan | 2005-08-05 23:18:36 -0700
Add edit to fix generated mxmkmf when doing a multilib build
Add support for latest lesstif version

File:

• scripts/untested/blfs-scripts/blfs-lesstif.sh (modified) (2 diffs)

scripts/untested/blfs-scripts/blfs-lesstif.sh

@@ -17 +17 @@
 cd ${PKGDIR}
 
-apply_patch lesstif-0.94.0-use_libdir
+case ${LESSTIF_VER} in
+   0.94.0 )
+     apply_patch lesstif-0.94.0-use_libdir
+   ;;
+   0.94.4 )
+     apply_patch lesstif-0.94.4-use_libdir_and_fix_installdirs
+     apply_patch lesstif-0.94.4-testsuite_fix-1
+   ;;
+esac
+
+# fix mxmkmf generation to point at correct location when multi-arch
+sed -i -e "/^lcfgdir=/s@/lib/@/${libdirname}/@g" \
+   lib/config/mxmkmf.in
 
 max_log_init lesstif ${LESSTIF_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
 CC="${CC-gcc} ${ARCH_CFLAGS}" \
 CXX="${CXX-g++} ${ARCH_CFLAGS}" \
-CFLAGS="${TGT_CFLAGS}" \
-CXXFLAGS="${TGT_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+CXXFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
 ./configure --prefix=/usr ${extra_conf} \
    --enable-build-21 \
@@ -45 +57 @@
 echo " o ALL OK" || barf
 
-# TODO: Need to edit /usr/bin/mxmkmf to set the correct libdir ...
-# (it really should be setup fom --libdir )
-if [ "Y" = "${MULTIARCH}" ]i; then
+if [ "Y" = "${MULTIARCH}" ]; then
    use_wrapper /usr/bin/mxmkmf
 fi