Search
j0ke.net Open Build Service
>
Projects
>
multimedia
:
EL6
>
libmikmod
> libmikmod-multilib.patch
Sign Up
|
Log In
Username
Password
Cancel
Overview
Repositories
Revisions
Requests
Users
Advanced
Attributes
Meta
File libmikmod-multilib.patch of Package libmikmod
--- libmikmod-3.1.11/libmikmod-config.in.old 2004-01-21 18:43:52.000000000 +0100 +++ libmikmod-3.1.11/libmikmod-config.in 2006-05-31 17:36:12.000000000 +0200 @@ -5,7 +5,7 @@ exec_prefix_set=no usage="\ -Usage: libmikmod-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags] [--ldadd]" +Usage: libmikmod-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--libs32] [--libs64] [--cflags] [--ldadd]" if test $# -eq 0 ; then echo "${usage}" 1>&2 @@ -49,9 +49,21 @@ echo @LIB_LDADD@ ;; --libs) + if [ -d /usr/lib64 ]; then + libdir=-L${exec_prefix}/lib64 + else + libdir=-L${exec_prefix}/lib + fi + echo $libdir -lmikmod @LIBRARY_LIB@ + ;; + --libs32) libdir=-L${exec_prefix}/lib echo $libdir -lmikmod @LIBRARY_LIB@ ;; + --libs64) + libdir=-L${exec_prefix}/lib64 + echo $libdir -lmikmod @LIBRARY_LIB@ + ;; *) echo "${usage}" 1>&2 exit 1 --- libmikmod-3.1.11/configure.old 2004-01-21 18:43:52.000000000 +0100 +++ libmikmod-3.1.11/configure 2006-05-31 17:37:10.000000000 +0200 @@ -6390,7 +6390,7 @@ cross_compiling=$ac_cv_prog_cc_cross ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags` - ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs` + ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs | sed -r 's|-L[^ ]+||g'` esd_major_version=`$ESD_CONFIG $esd_args --version | \ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`