Page MenuHomeFreeBSD
Differential D10448 Diff 27920 graphics/mesa-dri/files/configure.ac

Changeset View

Standalone View

View Options

graphics/mesa-dri/files/configure.ac

--- configure.ac.orig 2017-04-01 15:33:36 UTC --- configure.ac.orig 2017-04-01 15:33:36 UTC
+++ configure.ac +++ configure.ac
@@ -943,18 +943,19 @@ llvm_add_target() { @@ -942,19 +942,19 @@ llvm_add_target() {
# Call this inside ` ` to get the return value.
# $1 is the llvm-config command with arguments. # $1 is the llvm-config command with arguments.
strip_unwanted_llvm_flags() { strip_unwanted_llvm_flags() {
# Use \> (marks the end of the word) - # Use \> (marks the end of the word)
- echo " `$1`" | sed \ - echo " `$1`" | sed \
- -e 's/\s\+-m\S*//g' \ - -e 's/\s\+-m\S*//g' \
- -e 's/\s\+-DNDEBUG\>//g' \ - -e 's/\s\+-DNDEBUG\>//g' \
- -e 's/\s\+-D_GNU_SOURCE\>//g' \ - -e 's/\s\+-D_GNU_SOURCE\>//g' \
- -e 's/\s\+-pedantic\>//g' \ - -e 's/\s\+-pedantic\>//g' \
- -e 's/\s\+-W\S*//g' \ - -e 's/\s\+-W\S*//g' \
- -e 's/\s\+-O\S*//g' \ - -e 's/\s\+-O\S*//g' \
- -e 's/\s\+-g\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 \ + echo " `$1` " | sed -E \
+ -e 's/[[[:space:]]]+-m[[^[:space:]]]*//g' \ + -e 's/[[[:space:]]]+-m[[^[:space:]]]*//g' \
+ -e 's/[[[:space:]]]+-DNDEBUG\>//g' \ + -e 's/[[[:space:]]]+-DNDEBUG[[[:space:]]]/ /g' \
+ -e 's/[[[:space:]]]+-D_GNU_SOURCE\>//g' \ + -e 's/[[[:space:]]]+-D_GNU_SOURCE[[[:space:]]]/ /g' \
+ -e 's/[[[:space:]]]+-pedantic\>//g' \ + -e 's/[[[:space:]]]+-pedantic[[[:space:]]]/ /g' \
+ -e 's/[[[:space:]]]+-W[[^[:space:]]]*//g' \ + -e 's/[[[:space:]]]+-W[[^[:space:]]]*//g' \
+ -e 's/[[[:space:]]]+-O[[^[:space:]]]*//g' \ + -e 's/[[[:space:]]]+-O[[^[:space:]]]*//g' \
+ -e 's/[[[:space:]]]+-g[[^[:space:]]]*//g' \ + -e 's/[[[:space:]]]+-g[[^[:space:]]]*//g' \
-e 's/-fno-rtti\>/-Fno-rtti/g' \ + -e 's/-fno-rtti[[[:space:]]]/-Fno-rtti /g' \
- -e 's/\s\+-f\S*//g' \
+ -e 's/[[[:space:]]]+-f[[^[:space:]]]*//g' \ + -e 's/[[[:space:]]]+-f[[^[:space:]]]*//g' \
-e 's/-Fno-rtti\>/-fno-rtti/g' \ + -e 's/-Fno-rtti[[[:space:]]]/-fno-rtti /g' \
- -e 's/^ //' + -e 's/^[[[:space:]]]//' \
+ -e 's/-fno-exceptions\>//g' \ + -e 's/[[[:space:]]]$//'
+ -e 's/^[[[:space:]]]//'
} }
llvm_set_environment_variables() { llvm_set_environment_variables() {
@@ -1121,7 +1122,7 @@ fi @@ -1121,7 +1121,7 @@ fi
AC_SUBST(LIBSENSORS_LIBS) AC_SUBST(LIBSENSORS_LIBS)
case "$host_os" in case "$host_os" in
-linux*) -linux*)
+linux* | freebsd*) +linux* | freebsd*)
dri3_default=yes dri3_default=yes
;; ;;
*) *)
@@ -1631,7 +1632,7 @@ dnl platform checks. Set DEFINES and LIB @@ -1631,7 +1631,7 @@ dnl platform checks. Set DEFINES and LIB
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
@@ -2002,9 +2003,18 @@ if test "x$enable_opencl" = xyes; then @@ -2002,9 +2002,18 @@ if test "x$enable_opencl" = xyes; then
AC_MSG_ERROR([cannot enable OpenCL without Gallium]) AC_MSG_ERROR([cannot enable OpenCL without Gallium])
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
AC_MSG_ERROR([gcc >= 4.7 is required to build clover]) AC_MSG_ERROR([gcc >= 4.7 is required to build clover])
fi fi
+ fi # end of clang test + fi # end of clang test
if test "x$have_libclc" = xno; then if test "x$have_libclc" = xno; then
AC_MSG_ERROR([pkg-config cannot find libclc.pc which is required to build clover. AC_MSG_ERROR([pkg-config cannot find libclc.pc which is required to build clover.
@@ -2061,8 +2071,6 @@ if test "x$enable_opencl" = xyes; then @@ -2061,8 +2070,6 @@ if test "x$enable_opencl" = xyes; then
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}
- AS_IF([test ! -f "$CLANG_RESOURCE_DIR/include/stddef.h"], - AS_IF([test ! -f "$CLANG_RESOURCE_DIR/include/stddef.h"],
- [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.])]) - [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.])])
fi fi
AM_CONDITIONAL(HAVE_CLOVER, test "x$enable_opencl" = xyes) AM_CONDITIONAL(HAVE_CLOVER, test "x$enable_opencl" = xyes)
AM_CONDITIONAL(HAVE_CLOVER_ICD, test "x$enable_opencl_icd" = xyes) AM_CONDITIONAL(HAVE_CLOVER_ICD, test "x$enable_opencl_icd" = xyes)