diff -Naur mythtv.orig/configure mythtv.patch/configure
old
|
new
|
|
62 | 62 | echo " NOTE: profile is for sampling profilers" |
63 | 63 | echo " --prefix=PREFIX install in PREFIX [$PREFIX]" |
64 | 64 | 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]" |
65 | 67 | echo " --disable-ccache disable compiler cache (ccache)" |
66 | 68 | echo " --disable-distcc disable distributed compilation (distcc)" |
67 | 69 | <<BLOCK_QUOTE |
… |
… |
|
1058 | 1060 | |
1059 | 1061 | # installation paths |
1060 | 1062 | PREFIX="/usr/local" |
| 1063 | SYSROOT="" |
1061 | 1064 | libdir_name="lib" |
1062 | 1065 | libdir="" |
1063 | 1066 | shlibdir="$libdir" |
… |
… |
|
1271 | 1274 | ;; |
1272 | 1275 | --prefix=*) PREFIX="$optval" |
1273 | 1276 | ;; |
| 1277 | --sysroot=*) SYSROOT="$optval" |
| 1278 | ;; |
1274 | 1279 | --libdir-name=*) libdir_name="$optval" |
1275 | 1280 | ;; |
1276 | 1281 | --libdir=*) libdir="$optval" |
… |
… |
|
1665 | 1670 | done |
1666 | 1671 | fi |
1667 | 1672 | |
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` " |
1669 | 1674 | |
1670 | 1675 | HAS_IT="no" |
1671 | 1676 | for LIBPATH in $LIBPATHS ; do |
… |
… |
|
1678 | 1683 | |
1679 | 1684 | has_header() |
1680 | 1685 | { |
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" |
1682 | 1687 | INCL=`echo $DYLD_LIBRARY_PATH $LD_LIBRARY_PATH | sed s/':'/' '/g` |
1683 | 1688 | HPATHS="$HPATHS "$(echo $INCL | sed "s/$libdir_name/include/g") |
1684 | 1689 | |
… |
… |
|
2838 | 2843 | echo "Compiler cache $ccache$ccache_txt" |
2839 | 2844 | echo "DistCC $distcc$distcc_txt" |
2840 | 2845 | echo "install prefix $PREFIX" |
| 2846 | echo "sysroot prefix $SYSROOT" |
2841 | 2847 | <<BLOCK_QUOTE |
2842 | 2848 | echo "source path $source_path" |
2843 | 2849 | echo "C compiler $cc" |
… |
… |
|
3016 | 3022 | echo "#define FFMPEG_CONFIGURATION \"$FFMPEG_CONFIGURATION\"" >> $TMPH |
3017 | 3023 | |
3018 | 3024 | echo "PREFIX=$PREFIX" >> $MYTH_CONFIG_MAK |
| 3025 | echo "SYSROOT=$SYSROOT" >> $MYTH_CONFIG_MAK |
3019 | 3026 | echo "LIBDIR=$libdir" >> $MYTH_CONFIG_MAK |
3020 | 3027 | <<BLOCK_QUOTE |
3021 | 3028 | echo "SHLIBDIR=\$(DESTDIR)$shlibdir" >> config.mak |
diff -Naur mythtv.orig/settings.pro mythtv.patch/settings.pro
old
|
new
|
|
50 | 50 | # and we do that in their Makefiles if CONFIG has mac_bundle |
51 | 51 | macx: CONFIG += console |
52 | 52 | |
53 | | INCLUDEPATH += $${PREFIX}/include |
| 53 | INCLUDEPATH += $${SYSROOT}/$${PREFIX}/include |
54 | 54 | INCLUDEPATH += $$CONFIG_INCLUDEPATH |
55 | 55 | |
56 | 56 | # remove warn_{on|off} from CONFIG since we set it in our CFLAGS |