mirror of
https://git.freebsd.org/ports.git
synced 2025-05-23 04:03:14 -04:00
8a780985d0
- Add staging support - Convert optional dependencies to new format - Add a few clang patches but switch to USE_GCC=any because there's quite some work left (contributors?)
78 lines
2.3 KiB
Text
78 lines
2.3 KiB
Text
--- configure.orig 2013-09-18 20:06:08.000000000 +0000
|
|
+++ configure 2013-10-18 11:11:10.000000000 +0000
|
|
@@ -846,28 +846,28 @@
|
|
log check_cc "$@"
|
|
cat > $TMPC
|
|
log_file $TMPC
|
|
- check_cmd $cc $CPPFLAGS $CFLAGS "$@" $CC_C $(cc_o $TMPO) $TMPC
|
|
+ check_cmd $cc $CPPFLAGS $CFLAGS -I${prefix}/include "$@" $CC_C $(cc_o $TMPO) $TMPC
|
|
}
|
|
|
|
check_cxx(){
|
|
log check_cxx "$@"
|
|
cat > $TMPCPP
|
|
log_file $TMPCPP
|
|
- check_cmd $cxx $CPPFLAGS $CXXFLAGS "$@" $CXX_C -o $TMPO $TMPCPP
|
|
+ check_cmd $cxx $CPPFLAGS $CXXFLAGS -I${prefix}/include "$@" $CXX_C -o $TMPO $TMPCPP
|
|
}
|
|
|
|
check_ecxx(){
|
|
log check_cxx "$@"
|
|
cat > $TMPCPP
|
|
log_file $TMPCPP
|
|
- check_cmd $cxx $CPPFLAGS $CXXFLAGS $ECXXFLAGS "$@" $CXX_C -o $TMPO $TMPCPP
|
|
+ check_cmd $cxx $CPPFLAGS $CXXFLAGS $ECXXFLAGS -I${prefix}/include "$@" $CXX_C -o $TMPO $TMPCPP
|
|
}
|
|
|
|
check_cpp(){
|
|
log check_cpp "$@"
|
|
cat > $TMPC
|
|
log_file $TMPC
|
|
- check_cmd $cc $CPPFLAGS $CFLAGS "$@" $(cc_e $TMPO) $TMPC
|
|
+ check_cmd $cc $CPPFLAGS $CFLAGS -I${prefix}/include "$@" $(cc_e $TMPO) $TMPC
|
|
}
|
|
|
|
as_o(){
|
|
@@ -2539,7 +2539,7 @@
|
|
|
|
# machine
|
|
arch_default=$(uname -m)
|
|
-cpu="generic"
|
|
+cpu="i686"
|
|
processor=`uname -p 2>/dev/null`
|
|
processor_flags=""
|
|
tune="generic"
|
|
@@ -3931,7 +3931,7 @@
|
|
i686|pentiumpro|pentium[23]|pentium-m|athlon|athlon-tbird|athlon-4|athlon-[mx]p|athlon64*|k8*|opteron*|athlon-fx|core2|corei7*|amdfam10|barcelona|atom|bdver*)
|
|
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)
|
|
@@ -4102,7 +4102,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)
|
|
@@ -6383,6 +6382,7 @@
|
|
QMAKE_LIBDIR_QT-=${sysroot}${libdir}
|
|
QMAKE_LIBDIR-=${sysroot}${libdir}
|
|
LATE_LIBS+=-L${sysroot}${libdir}
|
|
+FREETYPE_CFLAGS-= -I/usr/local/include
|
|
EOF
|
|
|
|
#echo "endif # FFMPEG_CONFIG_MAK" >> $TMPMAK
|
|
@@ -6435,7 +6435,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
|
|
|