Changeset 236a72e


Ignore:
Timestamp:
Feb 21, 2006, 12:22:58 AM (17 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:
1 edited

Legend:

Unmodified
Added
Removed
  • scripts/untested/blfs-scripts/blfs-lesstif.sh

    r4e71b7e r236a72e  
    1717cd ${PKGDIR}
    1818
    19 apply_patch lesstif-0.94.0-use_libdir
     19case ${LESSTIF_VER} in
     20   0.94.0 )
     21     apply_patch lesstif-0.94.0-use_libdir
     22   ;;
     23   0.94.4 )
     24     apply_patch lesstif-0.94.4-use_libdir_and_fix_installdirs
     25     apply_patch lesstif-0.94.4-testsuite_fix-1
     26   ;;
     27esac
     28
     29# fix mxmkmf generation to point at correct location when multi-arch
     30sed -i -e "/^lcfgdir=/s@/lib/@/${libdirname}/@g" \
     31   lib/config/mxmkmf.in
    2032
    2133max_log_init lesstif ${LESSTIF_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
    2234CC="${CC-gcc} ${ARCH_CFLAGS}" \
    2335CXX="${CXX-g++} ${ARCH_CFLAGS}" \
    24 CFLAGS="${TGT_CFLAGS}" \
    25 CXXFLAGS="${TGT_CFLAGS}" \
     36CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
     37CXXFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
    2638./configure --prefix=/usr ${extra_conf} \
    2739   --enable-build-21 \
     
    4557echo " o ALL OK" || barf
    4658
    47 # TODO: Need to edit /usr/bin/mxmkmf to set the correct libdir ...
    48 # (it really should be setup fom --libdir )
    49 if [ "Y" = "${MULTIARCH}" ]i; then
     59if [ "Y" = "${MULTIARCH}" ]; then
    5060   use_wrapper /usr/bin/mxmkmf
    5161fi
Note: See TracChangeset for help on using the changeset viewer.