Changeset View
Changeset View
Standalone View
Standalone View
head/graphics/mesa-dri/files/patch-configure
| --- configure.orig 2017-04-01 15:33:50 UTC | --- configure.orig 2017-05-10 14:14:06 UTC | ||||
| +++ configure | +++ configure | ||||
| @@ -22350,19 +22350,19 @@ llvm_add_target() { | @@ -22709,7 +22709,7 @@ fi | ||||
| # Call this inside ` ` to get the return value. | |||||
| # $1 is the llvm-config command with arguments. | |||||
| strip_unwanted_llvm_flags() { | |||||
| - # Use \> (marks the end of the word) | |||||
| - echo " `$1`" | sed \ | |||||
| - -e 's/\s\+-m\S*//g' \ | |||||
| - -e 's/\s\+-DNDEBUG\>//g' \ | |||||
| - -e 's/\s\+-D_GNU_SOURCE\>//g' \ | |||||
| - -e 's/\s\+-pedantic\>//g' \ | |||||
| - -e 's/\s\+-W\S*//g' \ | |||||
| - -e 's/\s\+-O\S*//g' \ | |||||
| - -e 's/\s\+-g\S*//g' \ | |||||
| - -e 's/-fno-rtti\>/-Fno-rtti/g' \ | |||||
| - -e 's/\s\+-f\S*//g' \ | |||||
| - -e 's/-Fno-rtti\>/-fno-rtti/g' \ | |||||
| - -e 's/^ //' | |||||
| + echo " `$1` " | sed -E \ | |||||
| + -e 's/[[:space:]]+-m[^[:space:]]*//g' \ | |||||
| + -e 's/[[:space:]]+-DNDEBUG[[:space:]]/ /g' \ | |||||
| + -e 's/[[:space:]]+-D_GNU_SOURCE[[:space:]]/ /g' \ | |||||
| + -e 's/[[:space:]]+-pedantic[[:space:]]/ /g' \ | |||||
| + -e 's/[[:space:]]+-W[^[:space:]]*//g' \ | |||||
| + -e 's/[[:space:]]+-O[^[:space:]]*//g' \ | |||||
| + -e 's/[[:space:]]+-g[^[:space:]]*//g' \ | |||||
| + -e 's/-fno-rtti[[:space:]]/-Fno-rtti /g' \ | |||||
| + -e 's/[[:space:]]+-f[^[:space:]]*//g' \ | |||||
| + -e 's/-Fno-rtti[[:space:]]/-fno-rtti /g' \ | |||||
| + -e 's/^[[:space:]]//' \ | |||||
| + -e 's/[[:space:]]$//' | |||||
| } | |||||
| llvm_set_environment_variables() { | |||||
| @@ -22560,7 +22560,7 @@ fi | |||||
| case "$host_os" in | case "$host_os" in | ||||
| -linux*) | -linux*) | ||||
| +linux* | freebsd*) | +linux* | freebsd*) | ||||
| dri3_default=yes | dri3_default=yes | ||||
| ;; | ;; | ||||
| *) | *) | ||||
| @@ -24099,7 +24099,7 @@ fi | @@ -24108,7 +24108,7 @@ fi | ||||
| if test "x$enable_dri" = xyes; then | if test "x$enable_dri" = xyes; then | ||||
| # Platform specific settings and drivers to build | # Platform specific settings and drivers to build | ||||
| case "$host_os" in | case "$host_os" in | ||||
| - linux*) | - linux*) | ||||
| + linux* | freebsd*) | + linux* | freebsd*) | ||||
| if test "x$enable_dri3" = xyes; then | if test "x$enable_dri3" = xyes; then | ||||
| DEFINES="$DEFINES -DHAVE_DRI3" | DEFINES="$DEFINES -DHAVE_DRI3" | ||||
| fi | fi | ||||
| @@ -25851,9 +25851,19 @@ if test "x$enable_opencl" = xyes; then | @@ -25972,9 +25972,19 @@ if test "x$enable_opencl" = xyes; then | ||||
| as_fn_error $? "cannot enable OpenCL without Gallium" "$LINENO" 5 | as_fn_error $? "cannot enable OpenCL without Gallium" "$LINENO" 5 | ||||
| fi | fi | ||||
| + if test "x$acv_mesa_CLANG" = xno; then | + if test "x$acv_mesa_CLANG" = xno; then | ||||
| + | + | ||||
| + GCC_VERSION=`$CC -dumpversion` | + GCC_VERSION=`$CC -dumpversion` | ||||
| + if test $? -eq 0; then | + if test $? -eq 0; then | ||||
| + GCC_VERSION_MAJOR=`echo $GCC_VERSION | cut -d. -f1` | + GCC_VERSION_MAJOR=`echo $GCC_VERSION | cut -d. -f1` | ||||
| + GCC_VERSION_MINOR=`echo $GCC_VERSION | cut -d. -f2` | + GCC_VERSION_MINOR=`echo $GCC_VERSION | cut -d. -f2` | ||||
| + fi | + fi | ||||
| + | + | ||||
| if test $GCC_VERSION_MAJOR -lt 4 -o $GCC_VERSION_MAJOR -eq 4 -a $GCC_VERSION_MINOR -lt 7; then | if test $GCC_VERSION_MAJOR -lt 4 -o $GCC_VERSION_MAJOR -eq 4 -a $GCC_VERSION_MINOR -lt 7; then | ||||
| as_fn_error $? "gcc >= 4.7 is required to build clover" "$LINENO" 5 | as_fn_error $? "gcc >= 4.7 is required to build clover" "$LINENO" 5 | ||||
| fi | fi | ||||
| +# end of clang test. | +# end of clang test. | ||||
| + fi | + fi | ||||
| if test "x$have_libclc" = xno; then | if test "x$have_libclc" = xno; then | ||||
| as_fn_error $? "pkg-config cannot find libclc.pc which is required to build clover. | as_fn_error $? "pkg-config cannot find libclc.pc which is required to build clover. | ||||
| @@ -25916,9 +25926,6 @@ rm -f core conftest.err conftest.$ac_obj | @@ -26037,9 +26047,6 @@ rm -f core conftest.err conftest.$ac_obj | ||||
| CLANG_LIBDIR=${LLVM_LIBDIR} | CLANG_LIBDIR=${LLVM_LIBDIR} | ||||
| fi | fi | ||||
| CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION} | CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION} | ||||
| - if test ! -f "$CLANG_RESOURCE_DIR/include/stddef.h"; then : | - if test ! -f "$CLANG_RESOURCE_DIR/include/stddef.h"; then : | ||||
| - 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 | - 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 | ||||
| -fi | -fi | ||||
| fi | fi | ||||
| if test "x$enable_opencl" = xyes; then | if test "x$enable_opencl" = xyes; then | ||||
| HAVE_CLOVER_TRUE= | HAVE_CLOVER_TRUE= | ||||