anv: don't pass xmlfile via stdin anv_entrypoints_gen.py

[mesa.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 6b65ff831c500d3aaeb67d003bd53f0ad20f694c..ab9a91ed17bff352c71e039337ee07115ef2c2d7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -812,7 +812,7 @@ linux* | cygwin* | darwin* | solaris* | gnu*)
 esac
 
 if test "x$pthread_stubs_possible" = xyes; then
-    PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)
+    PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs >= 0.4)
     AC_SUBST(PTHREADSTUBS_CFLAGS)
     AC_SUBST(PTHREADSTUBS_LIBS)
 fi
@@ -907,19 +907,19 @@ llvm_add_target() {
 # 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 \
+    echo " `$1` " | sed -E \
         -e 's/[[[:space:]]]+-m[[^[:space:]]]*//g' \
-        -e 's/[[[:space:]]]+-DNDEBUG\>//g' \
-        -e 's/[[[:space:]]]+-D_GNU_SOURCE\>//g' \
-        -e 's/[[[:space:]]]+-pedantic\>//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\>/-Fno-rtti/g' \
+        -e 's/-fno-rtti[[[:space:]]]/-Fno-rtti /g' \
         -e 's/[[[:space:]]]+-f[[^[:space:]]]*//g' \
-        -e 's/-Fno-rtti\>/-fno-rtti/g' \
-        -e 's/^[[[:space:]]]//'
+        -e 's/-Fno-rtti[[[:space:]]]/-fno-rtti /g' \
+        -e 's/^[[[:space:]]]//' \
+        -e 's/[[[:space:]]]$//'
 }
 
 llvm_set_environment_variables() {
@@ -1786,12 +1786,12 @@ if test -n "$with_vulkan_drivers"; then
     for driver in $VULKAN_DRIVERS; do
         case "x$driver" in
         xintel)
-            require_libdrm "i965"
+            require_libdrm "ANV"
             PKG_CHECK_MODULES([INTEL], [libdrm >= $LIBDRM_INTEL_REQUIRED libdrm_intel >= $LIBDRM_INTEL_REQUIRED])
             HAVE_INTEL_VULKAN=yes
-
             ;;
         xradeon)
+            require_libdrm "radv"
             PKG_CHECK_MODULES([AMDGPU], [libdrm >= $LIBDRM_AMDGPU_REQUIRED libdrm_amdgpu >= $LIBDRM_AMDGPU_REQUIRED])
             radeon_llvm_check $LLVM_REQUIRED_RADV "radv"
             HAVE_RADEON_VULKAN=yes