Changeset c2b8e07

Timestamp:

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

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:

• scripts/untested/blfs-scripts/blfs-xmms.sh (modified) (3 diffs)

scripts/untested/blfs-scripts/blfs-xmms.sh

@@ -12 +12 @@
 if [ ! "${libdirname}" = "lib" ]; then
    extra_conf="--libdir=/usr/${libdirname}"
+   extra_conf="${extra_conf} --with-ogg-libraries=/usr/${libdirname}" 
+   extra_conf="${extra_conf} --with-vorbis-libraries=/usr/${libdirname}"
 fi
 
@@ -17 +19 @@
 cd ${PKGDIR}
 
-# NOTE: for 64bit I had to temporarily move /usr/lib/lib{glib,gmodule}.la
-#       out of the way to make it build...
-#
+#case ${TGT_ARCH} in
+#   x86_64 ) 
+#      if [ "${BUILDENV}" = "32" ]; then 
+#         extra_conf="${extra_conf} --enable-simd"
+#      fi
+#   ;;
+#   i?86 ) extra_conf="${extra_conf} --enable-simd" ;;
+#esac
+
+if [ ! "${libdirname}" = "lib" ]; then
+   # configure hack so we set libtool lib search path to look in 
+   # */${libdirname}
+   sed -i -e "/^sys_lib_\(\|dl\)search_path_spec/s@/lib@/${libdirname}@g" \
+      configure
+fi
 
 max_log_init xmms ${XMMS_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} \
    --mandir=/usr/share/man \
@@ -44 +58 @@
 echo " o ALL OK" || barf
 
-if [ "Y" = "${BIARCH}" ]i; then
+if [ "Y" = "${MULTIARCH}" ]; then
    # keep 32bit xmms (why, I dont know ;-) )
    use_wrapper /usr/bin/{xmms,xmms-config}
 fi
 
-chmod 755 /usr/${libdirname}/xmms.so.2.*