Changeset 0f496c0

Timestamp:

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

fdfb73b

Parents:

1c379e4

Message:

r590@server (orig r588): ryan | 2005-08-05 22:59:03 -0700
Add support to build ver 3.2, fix stupid bug

File:

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

scripts/untested/blfs-scripts/blfs-libmikmod.sh

@@ -17 +17 @@
 cd ${PKGDIR}
 
-sed -i -e "s/VERSION=10/VERSION=11/" \
-       -e "s/sys_asoundlib/alsa_asoundlib/" \
-       -e "s/snd_cards/snd_card_load/g" \
-       -e "s|sys/asoundlib.h|alsa/asoundlib.h|g" \
-    configure.in &&
-autoconf &&
+# Edits required for 3.1.11 and 3.2.0 beta (except the VERSION edit w 3.2.0)
+case ${LIBMIKMOD_VER} in
+   3.1.11 )
+      apply_patch libmikmod-3.1.11-a
+
+      sed -i -e "s/VERSION=10/VERSION=11/" \
+             -e "s/sys_asoundlib/alsa_asoundlib/" \
+             -e "s/snd_cards/snd_card_load/g" \
+             -e "s|sys/asoundlib.h|alsa/asoundlib.h|g" \
+             -e "s/^LIBOBJS/#LIBOBJS/g" \
+         configure.in &&
+      autoconf || barf
+   ;;
+   3.2.* )
+      sed -i -e "s/sys_asoundlib/alsa_asoundlib/" \
+             -e "s/snd_cards/snd_card_load/g" \
+             -e "s|sys/asoundlib.h|alsa/asoundlib.h|g" \
+             -e "s/^LIBOBJS/#LIBOBJS/g" \
+         configure.in &&
+      autoconf || barf
+   ;;
+esac
+
+sed -i -e "/libdir=/s@/lib*@/${libdirname}@g" \
+   libmikmod-config.in
 
 max_log_init libmikmod ${LIBMIKMOD_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 \
@@ -45 +64 @@
 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/libmikmod-config
 fi
 
-chmod 755 /usr/${libdir}/libmikmod.so.2.*
+case ${LIBMIKMOD_VER} in
+   3.1.* ) chmod 755 /usr/${libdirname}/libmikmod.so.2.* ;;
+   3.2.* ) chmod 755 /usr/${libdirname}/libmikmod.so.3.* ;;
+esac