[Mesa-dev] [PATCH] configure.ac: Strip patch version from LLVM version.

[Tobias Droste]

Hi Vinson,

ah sorry, CMAKE_INSTALL_PREFIX=~/code/llvm/build/result.
and you have to run make install.

Tobias

Am Samstag, 3. Dezember 2016, 23:54:37 CET schrieb Tobias Droste:
> Hi Vinson,
> 
> are you sure you are using the correct one?
> 
> I'm building llvm in ~/code/llvm.
> CMAKE_INSTALL_PREFIX is set to ~/code/llvm/build.
> 
> The final build results ends in ~/code/llvm/build/result (and not
> ~/code/llvm/ build)!
> 
> If you use ~/code/llvm/build/bin/llvm-config you get wrong values.
> You have to use ~/code/llvm/build/result/bin/llvm-config
> 
> This should give you the correct include dir and you get the LLVM version
> from the header files.
> 
> Tobias
> 
> Am Samstag, 3. Dezember 2016, 14:33:27 CET schrieb Vinson Lee:
> > Hi, Tobias.
> > 
> > <builddir>/bin/llvm-config --includedir returns <srcdir>/include. I am
> > not setting the "--with-llvm-prefix" configure option.
> > 
> > Cheers,
> > Vinson
> > 
> > On Sat, Dec 3, 2016 at 1:46 PM, Tobias Droste <tdroste at gmx.de> wrote:
> > > Hi Vinson,
> > > 
> > > 
> > > 
> > > why is LLVM_INCLUDEDIR not <builddir>/include? How does this happen?
> > > 
> > > Do you set "--with-llvm-prefix=<builddir>" when building mesa?
> > > 
> > > 
> > > 
> > > Tobias
> > > 
> > > Am Samstag, 3. Dezember 2016, 11:53:53 CET schrieb Vinson Lee:
> > >> Hi, Tobias.
> > >> 
> > >> 
> > >> 
> > >> I actually need this when using LLVM from a build tree and the header
> > >> 
> > >> files are not found. LLVM_INCLUDEDIR is <sourcedir>/include and the
> > >> 
> > >> header files are in <builddir>/include.
> > >> 
> > >> 
> > >> 
> > >> Cheers,
> > >> 
> > >> Vinson
> > >> 
> > >> On Sat, Dec 3, 2016 at 4:55 AM, Tobias Droste <tdroste at gmx.de> wrote:
> > >> > Hi Vinson,
> > >> > 
> > >> > 
> > >> > 
> > >> > this should not be needed and is obsolete as soon as this gets merged
> > >> > 
> > >> > (Emil?):
> > >> > 
> > >> > 
> > >> > https://lists.freedesktop.org/archives/mesa-dev/2016-November/135840.
> > >> > ht
> > >> > ml
> > >> > 
> > >> > 
> > >> > 
> > >> > Did you actually need this or were you just seeing that the code is
> > >> > wrong?
> > >> > 
> > >> > Because LLVM >=3.1 has the header files and this code should never
> > >> > 
> > >> > execute!
> > >> > 
> > >> > 
> > >> > 
> > >> > Tobias
> > >> > 
> > >> > Am Samstag, 3. Dezember 2016, 01:20:42 CET schrieb Vinson Lee:
> > >> >> HAVE_LLVM variable included the patch version if the LLVM version
> > >> >> had
> > >> >> a
> > >> >> 
> > >> >> patch version.
> > >> >> 
> > >> >> 
> > >> >> 
> > >> >> For LLVM version '4.0.0', HAVE_LLVM would be '0x0400.0'.
> > >> >> 
> > >> >> 
> > >> >> 
> > >> >> Fixes: 45574ab2e92f ("configure.ac: better detection of LLVM
> > >> >> version")
> > >> >> 
> > >> >> Signed-off-by: Vinson Lee <vlee at freedesktop.org>
> > >> >> 
> > >> >> ---
> > >> >> 
> > >> >> 
> > >> >> 
> > >> >> configure.ac | 2 +-
> > >> >> 
> > >> >> 1 file changed, 1 insertion(+), 1 deletion(-)
> > >> >> 
> > >> >> 
> > >> >> 
> > >> >> diff --git a/configure.ac b/configure.ac
> > >> >> 
> > >> >> index f62bc61e5025..3b8b32485ae1 100644
> > >> >> 
> > >> >> --- a/configure.ac
> > >> >> 
> > >> >> +++ b/configure.ac
> > >> >> 
> > >> >> @@ -2195,7 +2195,7 @@ if test "x$enable_gallium_llvm" = xyes || test
> > >> >> 
> > >> >> "x$HAVE_RADEON_VULKAN" = xyes; th if test -n
> > >> >> "${LLVM_VERSION_MAJOR}";
> > >> >> 
> > >> >> then
> > >> >> 
> > >> >> 
> > >> >> 
> > >> >> LLVM_VERSION_INT="${LLVM_VERSION_MAJOR}0${LLVM_VERSION_MINOR
> > >> >> 
> > >> >> }"
> > >> >> 
> > >> >> 
> > >> >> 
> > >> >> else
> > >> >> 
> > >> >> 
> > >> >> 
> > >> >> - LLVM_VERSION_INT=`echo $LLVM_VERSION | sed -e
> > >> >> 
> > >> >> 's/\([[0-9]]\)\.\([[0-9]]\)/\10\2/g'` + LLVM_VERSION_INT=`echo
> > >> >> 
> > >> >> $LLVM_VERSION | sed -e 's/\([[0-9]]\)\.\([[0-9]]\).*/\10\2/g'` fi
> > >> >> 
> > >> >> 
> > >> >> 
> > >> >> LLVM_REQUIRED_VERSION_MAJOR="3"
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev