source: build-files/ports-overlay/multimedia/mythtv/files/patch-configure @ 1e102bd

9.2-releasereleng/10.0releng/10.0.1releng/10.0.2
Last change on this file since 1e102bd was 1e102bd, checked in by Kris Moore <kris@…>, 10 months ago

Add a bunch of modified ports for 10.0, so we can fix the building

  • Property mode set to 100644
File size: 2.1 KB
Line 
1--- configure.orig      2012-10-02 12:30:24.000000000 +0200
2+++ configure   2012-10-03 19:27:16.773415414 +0200
3@@ -731,21 +731,21 @@
4     log check_cc "$@"
5     cat > $TMPC
6     log_file $TMPC
7-    check_cmd $cc $CPPFLAGS $CFLAGS "$@" -c -o $TMPO $TMPC
8+    check_cmd $cc $CPPFLAGS $CFLAGS -I${prefix}/include "$@" -c -o $TMPO $TMPC
9 }
10 
11 check_cxx(){
12     log check_cxx "$@"
13     cat > $TMPCPP
14     log_file $TMPCPP
15-    check_cmd $cxx $CPPFLAGS $CXXFLAGS "$@" -c -o $TMPO $TMPCPP
16+    check_cmd $cxx $CPPFLAGS $CXXFLAGS -I${prefix}/include "$@" -c -o $TMPO $TMPCPP
17 }
18 
19 check_cpp(){
20     log check_cpp "$@"
21     cat > $TMPC
22     log_file $TMPC
23-    check_cmd $cc $CPPFLAGS $CFLAGS "$@" -E -o $TMPO $TMPC
24+    check_cmd $cc $CPPFLAGS $CFLAGS -I${prefix}/include "$@" -E -o $TMPO $TMPC
25 }
26 
27 check_as(){
28@@ -2152,7 +2152,7 @@
29 
30 # machine
31 arch_default=$(uname -m)
32-cpu="generic"
33+cpu="i686"
34 processor=`uname -p 2>/dev/null`
35 processor_flags=""
36 tune="generic"
37@@ -3185,7 +3185,7 @@
38         i686|pentiumpro|pentium[23]|pentium-m|athlon|athlon-tbird|athlon-4|athlon-[mx]p|athlon64*|k8*|opteron*|athlon-fx|core2|amdfam10|barcelona|atom)
39             cpuflags="-march=$cpu"
40             enable cmov
41-            enable fast_cmov
42+            disable fast_cmov
43         ;;
44         # targets that do support conditional mov but on which it's slow
45         pentium4|pentium4m|prescott|nocona)
46@@ -3401,7 +3401,6 @@
47         append CCONFIG "freebsd"
48         # Workaround compile errors from missing u_int/uint def
49         CPPFLAGS=`echo $CPPFLAGS | sed 's/-D_POSIX_C_SOURCE=200112//'`
50-        disable ivtv
51         enable backend
52         ;;
53     bsd/os)
54@@ -5427,6 +5426,8 @@
55 QMAKE_LIBDIR_QT-=${sysroot}${libdir}
56 QMAKE_LIBDIR-=${sysroot}${libdir}
57 LATE_LIBS+=-L${sysroot}${libdir}
58+CONFIG_INCLUDEPATH=
59+FREETYPE_CFLAGS-= -I/usr/local/include
60 EOF
61 
62 #echo "endif # FFMPEG_CONFIG_MAK" >> $TMPMAK
63@@ -5477,7 +5478,7 @@
64 BINDIR=\$(INSTALL_ROOT)$bindir
65 DATADIR=\$(INSTALL_ROOT)$datadir
66 MANDIR=\$(INSTALL_ROOT)$mandir
67-CFLAGS=${CFLAGS} -w
68+CFLAGS=${CFLAGS} -I/usr/local/include -w
69 endif # FFMPEG_CONFIG_MAK
70 EOF
71 
Note: See TracBrowser for help on using the repository browser.