[Mesa-dev] [PATCH 1/2] configure.ac: Add LLVM_VERSION_PATCH to DEFINES

2014-05-08 Thread Tom Stellard 
---
 configure.ac | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index d6f21ea..c68db00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1605,6 +1605,12 @@ if test x$enable_gallium_llvm = xyes; then
 AC_COMPUTE_INT([LLVM_VERSION_MINOR], [LLVM_VERSION_MINOR],
 [#include ${LLVM_INCLUDEDIR}/llvm/Config/llvm-config.h])
 
+dnl In LLVM 3.4.1 patch level was defined in config.h and not
+dnl llvm-config.h
+AC_COMPUTE_INT([LLVM_VERSION_PATCH], [LLVM_VERSION_PATCH],
+[#include ${LLVM_INCLUDEDIR}/llvm/Config/config.h],
+LLVM_VERSION_PATCH=0) dnl Default if LLVM_VERSION_PATCH not found
+
 if test -n ${LLVM_VERSION_MAJOR}; then
 LLVM_VERSION_INT=${LLVM_VERSION_MAJOR}0${LLVM_VERSION_MINOR}
 else
@@ -1627,7 +1633,7 @@ if test x$enable_gallium_llvm = xyes; then
 LLVM_COMPONENTS=${LLVM_COMPONENTS} option
 fi
 fi
-DEFINES=${DEFINES} -DHAVE_LLVM=0x0$LLVM_VERSION_INT
+DEFINES=${DEFINES} -DHAVE_LLVM=0x0$LLVM_VERSION_INT 
-DLLVM_VERSION_PATCH=$LLVM_VERSION_PATCH
 MESA_LLVM=1
 
 dnl Check for Clang internal headers
-- 
1.8.1.5

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 1/2] configure.ac: Add LLVM_VERSION_PATCH to DEFINES

2014-05-08 Thread Michel Dänzer 

These changes should also go to stable. With that, both are

Reviewed-by: Michel Dänzer michel.daen...@amd.com


-- 
Earthling Michel Dänzer|  http://www.amd.com
Libre software enthusiast  |Mesa and X developer
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 1/2] configure.ac: Add LLVM_VERSION_PATCH to DEFINES

2014-05-08 Thread Michel Dänzer 
On 09.05.2014 11:23, Michel Dänzer wrote:
 
 These changes should also go to stable.

BTW, I mean:

CC: 10.1 10.2 mesa-sta...@lists.freedesktop.org

Otherwise it will only be considered for the 10.2 branch at this point.


-- 
Earthling Michel Dänzer|  http://www.amd.com
Libre software enthusiast  |Mesa and X developer
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev