Lines 1-35
Link Here
|
1 |
--- configure.ac.orig 2016-06-21 14:31:09.000000000 +0200 |
1 |
--- configure.ac.orig 2017-03-04 15:46:53 UTC |
2 |
+++ configure.ac 2016-07-08 13:05:53.236433000 +0200 |
2 |
+++ configure.ac |
3 |
@@ -871,7 +872,7 @@ |
3 |
@@ -943,18 +943,18 @@ llvm_add_target() { |
4 |
[enable_dri=yes]) |
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 |
+ echo " `$1`" | sed -E \ |
16 |
+ -e 's/[[[:space:]]]+-m[[^[:space:]]]*//g' \ |
17 |
+ -e 's/[[[:space:]]]+-DNDEBUG\>//g' \ |
18 |
+ -e 's/[[[:space:]]]+-D_GNU_SOURCE\>//g' \ |
19 |
+ -e 's/[[[:space:]]]+-pedantic\>//g' \ |
20 |
+ -e 's/[[[:space:]]]+-W[[^[:space:]]]*//g' \ |
21 |
+ -e 's/[[[:space:]]]+-O[[^[:space:]]]*//g' \ |
22 |
+ -e 's/[[[:space:]]]+-g[[^[:space:]]]*//g' \ |
23 |
-e 's/-fno-rtti\>/-Fno-rtti/g' \ |
24 |
- -e 's/\s\+-f\S*//g' \ |
25 |
+ -e 's/[[[:space:]]]+-f[[^[:space:]]]*//g' \ |
26 |
-e 's/-Fno-rtti\>/-fno-rtti/g' \ |
27 |
- -e 's/^ //' |
28 |
+ -e 's/^[[[:space:]]]//' |
29 |
} |
5 |
|
30 |
|
|
|
31 |
llvm_set_environment_variables() { |
32 |
@@ -1121,7 +1121,7 @@ fi |
33 |
AC_SUBST(LIBSENSORS_LIBS) |
34 |
|
6 |
case "$host_os" in |
35 |
case "$host_os" in |
7 |
-linux*) |
36 |
-linux*) |
8 |
+linux*|freebsd*) |
37 |
+linux* | freebsd*) |
9 |
dri3_default=yes |
38 |
dri3_default=yes |
10 |
;; |
39 |
;; |
11 |
*) |
40 |
*) |
12 |
@@ -1540,6 +1548,19 @@ |
41 |
@@ -1631,7 +1631,7 @@ dnl platform checks. Set DEFINES and LIB |
13 |
;; |
42 |
if test "x$enable_dri" = xyes; then |
14 |
gnu*) |
43 |
# Platform specific settings and drivers to build |
15 |
DEFINES="$DEFINES -DHAVE_ALIAS" |
44 |
case "$host_os" in |
16 |
+dnl not sure about dri3 support, just enable it for now. |
45 |
- linux*) |
17 |
+ if test "x$enable_dri3" = xyes; then |
46 |
+ linux* | *freebsd* | dragonfly* | *netbsd* | openbsd*) |
18 |
+ DEFINES="$DEFINES -DHAVE_DRI3" |
47 |
if test "x$enable_dri3" = xyes; then |
19 |
+ fi |
48 |
DEFINES="$DEFINES -DHAVE_DRI3" |
20 |
+ |
49 |
fi |
21 |
+ case "$host_cpu" in |
50 |
@@ -2002,9 +2002,19 @@ if test "x$enable_opencl" = xyes; then |
22 |
+ powerpc* | sparc*) |
|
|
23 |
+ # Build only the drivers for cards that exist on PowerPC/sparc |
24 |
+ if test "x$with_dri_drivers" = "xyes"; then |
25 |
+ with_dri_drivers="r200 radeon swrast" |
26 |
+ fi |
27 |
+ ;; |
28 |
+ esac |
29 |
;; |
30 |
cygwin*) |
31 |
if test "x$with_dri_drivers" = "xyes"; then |
32 |
@@ -1921,9 +1948,19 @@ |
33 |
AC_MSG_ERROR([cannot enable OpenCL without Gallium]) |
51 |
AC_MSG_ERROR([cannot enable OpenCL without Gallium]) |
34 |
fi |
52 |
fi |
35 |
|
53 |
|
Lines 49-73
Link Here
|
49 |
|
67 |
|
50 |
if test "x$have_libclc" = xno; then |
68 |
if test "x$have_libclc" = xno; then |
51 |
AC_MSG_ERROR([pkg-config cannot find libclc.pc which is required to build clover. |
69 |
AC_MSG_ERROR([pkg-config cannot find libclc.pc which is required to build clover. |
52 |
@@ -2102,9 +2139,9 @@ |
70 |
@@ -2047,8 +2057,6 @@ if test "x$enable_opencl" = xyes; then |
53 |
strip_unwanted_llvm_flags() { |
71 |
CLANG_LIBDIR=${LLVM_LIBDIR} |
54 |
# Use \> (marks the end of the word) |
72 |
fi |
55 |
echo `$1` | sed \ |
73 |
CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION} |
56 |
- -e 's/-march=\S*//g' \ |
74 |
- AS_IF([test ! -f "$CLANG_RESOURCE_DIR/include/stddef.h"], |
57 |
- -e 's/-mtune=\S*//g' \ |
75 |
- [AC_MSG_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.])]) |
58 |
- -e 's/-mcpu=\S*//g' \ |
76 |
fi |
59 |
+ -e 's/-march=[[:graph:]]* //g' \ |
77 |
AM_CONDITIONAL(HAVE_CLOVER, test "x$enable_opencl" = xyes) |
60 |
+ -e 's/-mtune=[[:graph:]]* //g' \ |
78 |
AM_CONDITIONAL(HAVE_CLOVER_ICD, test "x$enable_opencl_icd" = xyes) |
61 |
+ -e 's/-mcpu=[[:graph:]]* //g' \ |
|
|
62 |
-e 's/-DNDEBUG\>//g' \ |
63 |
-e 's/-D_GNU_SOURCE\>//g' \ |
64 |
-e 's/-pedantic\>//g' \ |
65 |
@@ -2196,8 +2233,6 @@ |
66 |
CLANG_LIBDIR=${LLVM_LIBDIR} |
67 |
fi |
68 |
CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION} |
69 |
- AS_IF([test ! -f "$CLANG_RESOURCE_DIR/include/stddef.h"], |
70 |
- [AC_MSG_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.])]) |
71 |
fi |
72 |
else |
73 |
MESA_LLVM=0 |