064885a929
- Convert to OptionsNG - Force binutils from ports for 7.x/8.x because binutils from base is too old - Trim Makefile headers Feature safe: yes
71 lines
2.1 KiB
Text
71 lines
2.1 KiB
Text
--- configure.orig 2012-10-02 12:30:24.000000000 +0200
|
|
+++ configure 2012-10-03 19:27:16.773415414 +0200
|
|
@@ -731,21 +731,21 @@
|
|
log check_cc "$@"
|
|
cat > $TMPC
|
|
log_file $TMPC
|
|
- check_cmd $cc $CPPFLAGS $CFLAGS "$@" -c -o $TMPO $TMPC
|
|
+ check_cmd $cc $CPPFLAGS $CFLAGS -I${prefix}/include "$@" -c -o $TMPO $TMPC
|
|
}
|
|
|
|
check_cxx(){
|
|
log check_cxx "$@"
|
|
cat > $TMPCPP
|
|
log_file $TMPCPP
|
|
- check_cmd $cxx $CPPFLAGS $CXXFLAGS "$@" -c -o $TMPO $TMPCPP
|
|
+ check_cmd $cxx $CPPFLAGS $CXXFLAGS -I${prefix}/include "$@" -c -o $TMPO $TMPCPP
|
|
}
|
|
|
|
check_cpp(){
|
|
log check_cpp "$@"
|
|
cat > $TMPC
|
|
log_file $TMPC
|
|
- check_cmd $cc $CPPFLAGS $CFLAGS "$@" -E -o $TMPO $TMPC
|
|
+ check_cmd $cc $CPPFLAGS $CFLAGS -I${prefix}/include "$@" -E -o $TMPO $TMPC
|
|
}
|
|
|
|
check_as(){
|
|
@@ -2152,7 +2152,7 @@
|
|
|
|
# machine
|
|
arch_default=$(uname -m)
|
|
-cpu="generic"
|
|
+cpu="i686"
|
|
processor=`uname -p 2>/dev/null`
|
|
processor_flags=""
|
|
tune="generic"
|
|
@@ -3185,7 +3185,7 @@
|
|
i686|pentiumpro|pentium[23]|pentium-m|athlon|athlon-tbird|athlon-4|athlon-[mx]p|athlon64*|k8*|opteron*|athlon-fx|core2|amdfam10|barcelona|atom)
|
|
cpuflags="-march=$cpu"
|
|
enable cmov
|
|
- enable fast_cmov
|
|
+ disable fast_cmov
|
|
;;
|
|
# targets that do support conditional mov but on which it's slow
|
|
pentium4|pentium4m|prescott|nocona)
|
|
@@ -3401,7 +3401,6 @@
|
|
append CCONFIG "freebsd"
|
|
# Workaround compile errors from missing u_int/uint def
|
|
CPPFLAGS=`echo $CPPFLAGS | sed 's/-D_POSIX_C_SOURCE=200112//'`
|
|
- disable ivtv
|
|
enable backend
|
|
;;
|
|
bsd/os)
|
|
@@ -5427,6 +5426,8 @@
|
|
QMAKE_LIBDIR_QT-=${sysroot}${libdir}
|
|
QMAKE_LIBDIR-=${sysroot}${libdir}
|
|
LATE_LIBS+=-L${sysroot}${libdir}
|
|
+CONFIG_INCLUDEPATH=
|
|
+FREETYPE_CFLAGS-= -I/usr/local/include
|
|
EOF
|
|
|
|
#echo "endif # FFMPEG_CONFIG_MAK" >> $TMPMAK
|
|
@@ -5477,7 +5478,7 @@
|
|
BINDIR=\$(INSTALL_ROOT)$bindir
|
|
DATADIR=\$(INSTALL_ROOT)$datadir
|
|
MANDIR=\$(INSTALL_ROOT)$mandir
|
|
-CFLAGS=${CFLAGS} -w
|
|
+CFLAGS=${CFLAGS} -I/usr/local/include -w
|
|
endif # FFMPEG_CONFIG_MAK
|
|
EOF
|
|
|