Changeset c2b8e07


Ignore:
Timestamp:
Feb 21, 2006, 12:22:14 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:
8c8c5ab
Parents:
57d97a5
Message:

r595@server (orig r593): ryan | 2005-08-05 23:08:26 -0700
Add hack to change sys_lib_dlsearch_path_spec and sys_lib_search_path_spec that
gets passed to libtool via configure so we look in the correct places for libs


Use MULTIARCH instead of BIARCH (duh)



File:
1 edited

Legend:

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

    r57d97a5 rc2b8e07  
    1212if [ ! "${libdirname}" = "lib" ]; then
    1313   extra_conf="--libdir=/usr/${libdirname}"
     14   extra_conf="${extra_conf} --with-ogg-libraries=/usr/${libdirname}"
     15   extra_conf="${extra_conf} --with-vorbis-libraries=/usr/${libdirname}"
    1416fi
    1517
     
    1719cd ${PKGDIR}
    1820
    19 # NOTE: for 64bit I had to temporarily move /usr/lib/lib{glib,gmodule}.la
    20 #       out of the way to make it build...
    21 #
     21#case ${TGT_ARCH} in
     22#   x86_64 )
     23#      if [ "${BUILDENV}" = "32" ]; then
     24#         extra_conf="${extra_conf} --enable-simd"
     25#      fi
     26#   ;;
     27#   i?86 ) extra_conf="${extra_conf} --enable-simd" ;;
     28#esac
     29
     30if [ ! "${libdirname}" = "lib" ]; then
     31   # configure hack so we set libtool lib search path to look in
     32   # */${libdirname}
     33   sed -i -e "/^sys_lib_\(\|dl\)search_path_spec/s@/lib@/${libdirname}@g" \
     34      configure
     35fi
    2236
    2337max_log_init xmms ${XMMS_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
    2438CC="${CC-gcc} ${ARCH_CFLAGS}" \
    2539CXX="${CXX-g++} ${ARCH_CFLAGS}" \
    26 CFLAGS="${TGT_CFLAGS}" \
    27 CXXFLAGS="${TGT_CFLAGS}" \
     40CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
     41CXXFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
    2842./configure --prefix=/usr ${extra_conf} \
    2943   --mandir=/usr/share/man \
     
    4458echo " o ALL OK" || barf
    4559
    46 if [ "Y" = "${BIARCH}" ]i; then
     60if [ "Y" = "${MULTIARCH}" ]; then
    4761   # keep 32bit xmms (why, I dont know ;-) )
    4862   use_wrapper /usr/bin/{xmms,xmms-config}
    4963fi
    5064
    51 chmod 755 /usr/${libdirname}/xmms.so.2.*
Note: See TracChangeset for help on using the changeset viewer.