Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/bmpx/patches/bmpx-0.40.13-multilib.patch

    Contents of /trunk/bmpx/patches/bmpx-0.40.13-multilib.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 586 - (show annotations) (download)
    Sun Apr 27 23:25:33 2008 UTC (16 years ago) by niro
    File size: 2375 byte(s) 
    -fix compilation in multilib systems
    1 diff -urN bmpx-0.40.13.org/configure.ac bmpx-0.40.13/configure.ac
    2 --- bmpx-0.40.13.org/configure.ac 2007-10-18 19:17:17.000000000 +0200
    3 +++ bmpx-0.40.13/configure.ac 2007-11-26 18:17:26.398334212 +0100
    4 @@ -406,7 +406,7 @@
    5 if test "$have_sid" = "yes"; then
    6 AC_DEFINE([HAVE_SID], [1], [have sid])
    7 SID_INCLUDES="-I$sid_prefix/sidplay"
    8 - SID_LIBS="-L$sid_prefix/lib -lsidplay"
    9 + SID_LIBS="-lsidplay"
    10 else
    11 AC_MSG_ERROR([libsidplay 1.x not found!])
    12 fi
    13 @@ -586,7 +586,7 @@
    14 else
    15 CDPARANOIA_INCLUDES="-I$cdparanoia_prefix/include"
    16 fi
    17 - CDPARANOIA_LIBS="-L$cdparanoia_prefix/lib -lcdda_interface"
    18 + CDPARANOIA_LIBS="-lcdda_interface"
    19 else
    20 AC_MSG_ERROR([cdparanoia not found!])
    21 fi
    22 diff -urN bmpx-0.40.13.org/m4/boost_base.m4 bmpx-0.40.13/m4/boost_base.m4
    23 --- bmpx-0.40.13.org/m4/boost_base.m4 2007-10-18 19:17:06.000000000 +0200
    24 +++ bmpx-0.40.13/m4/boost_base.m4 2007-11-26 18:14:17.614634080 +0100
    25 @@ -67,12 +67,10 @@
    26 dnl this location ist chosen if boost libraries are installed with the --layout=system option
    27 dnl or if you install boost with RPM
    28 if test "$ac_boost_path" != ""; then
    29 - BOOST_LDFLAGS="-L$ac_boost_path/lib"
    30 BOOST_CPPFLAGS="-I$ac_boost_path/include"
    31 else
    32 for ac_boost_path_tmp in /usr /usr/local /opt /opt/local /usr/lib64 /usr/local/lib64; do
    33 if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
    34 - BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib"
    35 BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
    36 break;
    37 fi
    38 @@ -111,7 +109,6 @@
    39 if test "x$succeeded" != "xyes"; then
    40 _version=0
    41 if test "$ac_boost_path" != ""; then
    42 - BOOST_LDFLAGS="-L$ac_boost_path/lib"
    43 if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
    44 for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
    45 _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
    46 @@ -139,7 +136,6 @@
    47
    48 VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
    49 BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
    50 - BOOST_LDFLAGS="-L$best_path/lib"
    51
    52 if test "x$BOOST_ROOT" != "x"; then
    53 if test -d "$BOOST_ROOT" && test -r "$BOOST_ROOT" && test -d "$BOOST_ROOT/stage/lib" && test -r "$BOOST_ROOT/stage/lib"; then