Ticket #4522: 010_mythtv-svn_crosscompiling_1.0.diff

File 010_mythtv-svn_crosscompiling_1.0.diff, 2.9 KB (added by anonymous, 14 years ago)
  • configure

    diff -Naur mythtv.orig/configure mythtv.patch/configure
    old new  
    6262  echo "                           NOTE: profile is for sampling profilers"
    6363  echo "  --prefix=PREFIX          install in PREFIX [$PREFIX]"
    6464  echo "  --libdir-name=LIBNAME    search/install libraries in PREFIX/LIBNAME [$libdir_name]"
     65  echo "  --sysroot=SYSROOTPATH    search libraries and headers in "
     66  echo "                           SYSROOT/PREFIX/LIBNAME and SYSROOT/PREFIX/HEADERNAME [$SYSROOT]"
    6567  echo "  --disable-ccache         disable compiler cache (ccache)"
    6668  echo "  --disable-distcc         disable distributed compilation (distcc)"
    6769<<BLOCK_QUOTE
     
    10581060
    10591061# installation paths
    10601062PREFIX="/usr/local"
     1063SYSROOT=""
    10611064libdir_name="lib"
    10621065libdir=""
    10631066shlibdir="$libdir"
     
    12711274  ;;
    12721275  --prefix=*) PREFIX="$optval"
    12731276  ;;
     1277  --sysroot=*) SYSROOT="$optval"
     1278  ;;
    12741279  --libdir-name=*) libdir_name="$optval"
    12751280  ;;
    12761281  --libdir=*) libdir="$optval"
     
    16651670        done
    16661671    fi
    16671672
    1668     LIBPATHS="`echo $LIBPATHS /$libdir_name /usr/$libdir_name /usr/local/$libdir_name /usr/X11R6/$libdir_name | sed s/'\/ '/' '/g` "
     1673    LIBPATHS="`echo $LIBPATHS $SYSROOT/$libdir_name $SYSROOT/usr/$libdir_name $SYSROOT/usr/local/$libdir_name $SYSROOT/usr/X11R6/$libdir_name | sed s/'\/ '/' '/g` "
    16691674
    16701675    HAS_IT="no"
    16711676    for LIBPATH in $LIBPATHS ; do
     
    16781683
    16791684has_header()
    16801685{
    1681     HPATHS="/usr/local/include /usr/include /usr/include/g++-v3 /usr/X11R6/include"
     1686    HPATHS="$SYSROOT/usr/local/include $SYSROOT/usr/include $SYSROOT/usr/include/g++-v3 $SYSROOT/usr/X11R6/include"
    16821687    INCL=`echo $DYLD_LIBRARY_PATH $LD_LIBRARY_PATH | sed s/':'/' '/g`
    16831688    HPATHS="$HPATHS "$(echo $INCL | sed "s/$libdir_name/include/g")
    16841689
     
    28382843echo "Compiler cache            $ccache$ccache_txt"
    28392844echo "DistCC                    $distcc$distcc_txt"
    28402845echo "install prefix            $PREFIX"
     2846echo "sysroot prefix            $SYSROOT"
    28412847<<BLOCK_QUOTE
    28422848echo "source path               $source_path"
    28432849echo "C compiler                $cc"
     
    30163022echo "#define FFMPEG_CONFIGURATION \"$FFMPEG_CONFIGURATION\"" >> $TMPH
    30173023
    30183024echo "PREFIX=$PREFIX" >> $MYTH_CONFIG_MAK
     3025echo "SYSROOT=$SYSROOT" >> $MYTH_CONFIG_MAK
    30193026echo "LIBDIR=$libdir" >> $MYTH_CONFIG_MAK
    30203027<<BLOCK_QUOTE
    30213028echo "SHLIBDIR=\$(DESTDIR)$shlibdir" >> config.mak
  • settings.pro

    diff -Naur mythtv.orig/settings.pro mythtv.patch/settings.pro
    old new  
    5050# and we do that in their Makefiles if CONFIG has mac_bundle
    5151macx: CONFIG += console
    5252
    53 INCLUDEPATH += $${PREFIX}/include
     53INCLUDEPATH += $${SYSROOT}/$${PREFIX}/include
    5454INCLUDEPATH += $$CONFIG_INCLUDEPATH
    5555
    5656# remove warn_{on|off} from CONFIG since we set it in our CFLAGS