diff options
author | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-02-24 21:03:20 +0100 |
---|---|---|
committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-02-25 20:36:17 +0100 |
commit | 8fab324e8eb797162e943303884bd6a0f14692c8 (patch) | |
tree | 3bc75ab901c45b923b659d2ea310301f95585cc9 /recipes/mythtv/mythtv | |
parent | 930f35b6a90752e05aca4e3d03141d4a4d876eb1 (diff) | |
download | openembedded-8fab324e8eb797162e943303884bd6a0f14692c8.tar.gz |
mythtv: renamed to 0.22+fixes
renamed the recipes from 0.22 to 0.22+fixes as they have moved away from 0.22
and are already building the 0.22+fixes version.
also renamed the mythtv-0.22 dir to mythtv
Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'recipes/mythtv/mythtv')
-rw-r--r-- | recipes/mythtv/mythtv/configure.patch | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/recipes/mythtv/mythtv/configure.patch b/recipes/mythtv/mythtv/configure.patch new file mode 100644 index 0000000000..748c88d9fc --- /dev/null +++ b/recipes/mythtv/mythtv/configure.patch @@ -0,0 +1,61 @@ +Index: mythtv/configure +=================================================================== +--- mythtv/configure (revision 22430) ++++ mythtv/configure (working copy) +@@ -919,27 +919,27 @@ + #deprecated, use check_lib or check_lib2 instead + has_library() + { +- if test -f /etc/ld.so.conf ; then +- LIBPATHS=`cat /etc/ld.so.conf | grep -v "#" | grep -v "include"` +- else +- LIBPATHS='' +- fi ++ LIBPATHS='' ++ if test "x${sysroot}" = "x" ; then ++ if test -f /etc/ld.so.conf ; then ++ LIBPATHS=`cat /etc/ld.so.conf | grep -v "#" | grep -v "include"` ++ fi ++ LIBPATHS="$LIBPATHS `echo $LD_LIBRARY_PATH | sed s/':'/' '/g` " ++ # Mac OS X has a different variable for this: ++ LIBPATHS="$LIBPATHS `echo $DYLD_LIBRARY_PATH | sed s/':'/' '/g` " + +- LIBPATHS="$LIBPATHS `echo $LD_LIBRARY_PATH | sed s/':'/' '/g` " +- # Mac OS X has a different variable for this: +- LIBPATHS="$LIBPATHS `echo $DYLD_LIBRARY_PATH | sed s/':'/' '/g` " +- +- # recurse down just one level, should be enough in most cases +- if test -f /etc/ld.so.conf ; then +- INCL=`cat /etc/ld.so.conf | grep -v "#" | grep "^include"` +- SRCH=`echo "$INCL" | sed '{ s/^include \//\//; s/^include /\/etc\//}'` +- for x in $SRCH ; do +- LP_APPEND=`cat $x | grep -v "#" | grep -v "^include"` +- LIBPATHS="$LIBPATHS $LP_APPEND" +- done ++ # recurse down just one level, should be enough in most cases ++ if test -f /etc/ld.so.conf ; then ++ INCL=`cat /etc/ld.so.conf | grep -v "#" | grep "^include"` ++ SRCH=`echo "$INCL" | sed '{ s/^include \//\//; s/^include /\/etc\//}'` ++ for x in $SRCH ; do ++ LP_APPEND=`cat $x | grep -v "#" | grep -v "^include"` ++ LIBPATHS="$LIBPATHS $LP_APPEND" ++ done ++ fi + fi + +- LIBPATHS="`echo $LIBPATHS /$libdir_name /usr/$libdir_name /usr/local/$libdir_name /usr/X11R6/$libdir_name | sed s/'\/ '/' '/g` " ++ LIBPATHS="`echo $LIBPATHS $sysroot/$libdir_name $sysroot/usr/$libdir_name $sysroot/usr/local/$libdir_name $sysroot/usr/X11R6/$libdir_name | sed s/'\/ '/' '/g` " + + HAS_IT="no" + for LIBPATH in $LIBPATHS ; do +@@ -4252,8 +4252,8 @@ + # -L from early in the link line, to ignore any old installed libmyth* + # Note: Qt uses QMAKE_INCDIR_QT to build an absolute path for include + # directories, it cannot be modified. +-QMAKE_LIBDIR_QT -= $libdir +-LATE_LIBS += -L$libdir ++QMAKE_LIBDIR_QT -= ${sysroot}${libdir} ++LATE_LIBS += -L${sysroot}${libdir} + EOF + + diff $TMPH $MYTH_CONFIG_H >/dev/null 2>&1 |