Lines 1-8
Link Here
|
1 |
--- configure.orig 2017-01-05 15:52:21 UTC |
1 |
--- configure.orig 2017-03-04 15:47:01 UTC |
2 |
+++ configure |
2 |
+++ configure |
3 |
@@ -21955,7 +21955,7 @@ fi |
3 |
@@ -22307,18 +22307,18 @@ llvm_add_target() { |
|
|
4 |
# $1 is the llvm-config command with arguments. |
5 |
strip_unwanted_llvm_flags() { |
6 |
# Use \> (marks the end of the word) |
7 |
- echo " `$1`" | sed \ |
8 |
- -e 's/\s\+-m\S*//g' \ |
9 |
- -e 's/\s\+-DNDEBUG\>//g' \ |
10 |
- -e 's/\s\+-D_GNU_SOURCE\>//g' \ |
11 |
- -e 's/\s\+-pedantic\>//g' \ |
12 |
- -e 's/\s\+-W\S*//g' \ |
13 |
- -e 's/\s\+-O\S*//g' \ |
14 |
- -e 's/\s\+-g\S*//g' \ |
15 |
- -e 's/-fno-rtti\>/-Fno-rtti/g' \ |
16 |
- -e 's/\s\+-f\S*//g' \ |
17 |
- -e 's/-Fno-rtti\>/-fno-rtti/g' \ |
18 |
- -e 's/^ //' |
19 |
+ echo " `$1`" | sed -E \ |
20 |
+ -e 's/[[:blank:]]+-m[^[:blank:]]*//g' \ |
21 |
+ -e 's/[[:blank:]]+-DNDEBUG\>//g' \ |
22 |
+ -e 's/[[:blank:]]+-D_GNU_SOURCE\>//g' \ |
23 |
+ -e 's/[[:blank:]]+-pedantic\>//g' \ |
24 |
+ -e 's/[[:blank:]]+-W[^[:blank:]]*//g' \ |
25 |
+ -e 's/[[:blank:]]+-O[^[:blank:]]*//g' \ |
26 |
+ -e 's/[[:blank:]]+-g[^[:blank:]]*//g' \ |
27 |
+ -e 's/-fno-rtti\>/-Fno-rtti/g' \ |
28 |
+ -e 's/[[:blank:]]+-f[^[:blank:]]*//g' \ |
29 |
+ -e 's/-Fno-rtti\>/-fno-rtti/g' \ |
30 |
+ -e 's/^[[:blank:]]//' |
31 |
} |
4 |
|
32 |
|
|
|
33 |
llvm_set_environment_variables() { |
34 |
@@ -22516,7 +22516,7 @@ fi |
5 |
|
35 |
|
|
|
36 |
|
6 |
case "$host_os" in |
37 |
case "$host_os" in |
7 |
-linux*) |
38 |
-linux*) |
8 |
+linux*|freebsd*) |
39 |
+linux*|freebsd*) |
Lines 9-34
Link Here
|
9 |
dri3_default=yes |
40 |
dri3_default=yes |
10 |
;; |
41 |
;; |
11 |
*) |
42 |
*) |
12 |
@@ -23968,6 +23968,18 @@ if test "x$enable_dri" = xyes; then |
43 |
@@ -24055,7 +24055,7 @@ fi |
13 |
;; |
44 |
if test "x$enable_dri" = xyes; then |
14 |
*freebsd* | dragonfly* | *netbsd* | openbsd*) |
45 |
# Platform specific settings and drivers to build |
15 |
DEFINES="$DEFINES -DHAVE_ALIAS" |
46 |
case "$host_os" in |
16 |
+ if test "x$enable_dri3" = xyes; then |
47 |
- linux*) |
17 |
+ DEFINES="$DEFINES -DHAVE_DRI3" |
48 |
+ linux* | *freebsd* | dragonfly* | *netbsd* | openbsd*) |
18 |
+ fi |
49 |
if test "x$enable_dri3" = xyes; then |
19 |
+ |
50 |
DEFINES="$DEFINES -DHAVE_DRI3" |
20 |
+ case "$host_cpu" in |
51 |
fi |
21 |
+ powerpc* | sparc*) |
52 |
@@ -25807,9 +25807,19 @@ if test "x$enable_opencl" = xyes; then |
22 |
+ # Build only the drivers for cards that exist on PowerPC/sparc |
|
|
23 |
+ if test "x$with_dri_drivers" = "xyes"; then |
24 |
+ with_dri_drivers="r200 radeon swrast" |
25 |
+ fi |
26 |
+ ;; |
27 |
+ esac |
28 |
;; |
29 |
gnu*) |
30 |
DEFINES="$DEFINES -DHAVE_ALIAS" |
31 |
@@ -25849,9 +25861,19 @@ if test "x$enable_opencl" = xyes; then |
32 |
as_fn_error $? "cannot enable OpenCL without Gallium" "$LINENO" 5 |
53 |
as_fn_error $? "cannot enable OpenCL without Gallium" "$LINENO" 5 |
33 |
fi |
54 |
fi |
34 |
|
55 |
|
Lines 48-60
Link Here
|
48 |
|
69 |
|
49 |
if test "x$have_libclc" = xno; then |
70 |
if test "x$have_libclc" = xno; then |
50 |
as_fn_error $? "pkg-config cannot find libclc.pc which is required to build clover. |
71 |
as_fn_error $? "pkg-config cannot find libclc.pc which is required to build clover. |
51 |
@@ -26670,9 +26692,6 @@ fi |
72 |
@@ -25851,9 +25861,6 @@ if test "x$enable_opencl" = xyes; then |
52 |
CLANG_LIBDIR=${LLVM_LIBDIR} |
73 |
CLANG_LIBDIR=${LLVM_LIBDIR} |
53 |
fi |
74 |
fi |
54 |
CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION} |
75 |
CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION} |
55 |
- if test ! -f "$CLANG_RESOURCE_DIR/include/stddef.h"; then : |
76 |
- if test ! -f "$CLANG_RESOURCE_DIR/include/stddef.h"; then : |
56 |
- as_fn_error $? "Could not find clang internal header stddef.h in $CLANG_RESOURCE_DIR Use --with-clang-libdir to specify the correct path to the clang libraries." "$LINENO" 5 |
77 |
- as_fn_error $? "Could not find clang internal header stddef.h in $CLANG_RESOURCE_DIR Use --with-clang-libdir to specify the correct path to the clang libraries." "$LINENO" 5 |
57 |
-fi |
78 |
-fi |
58 |
fi |
79 |
fi |
59 |
else |
80 |
if test "x$enable_opencl" = xyes; then |
60 |
MESA_LLVM=0 |
81 |
HAVE_CLOVER_TRUE= |