diff mbox

[FFmpeg-devel] configure: cuda_llvm: fix include path for MSYS2

Message ID 20190805194703.32166-1-wiiaboo@gmail.com
State Accepted
Commit 5ac28e9cc19069a104f5534dcf603218066d144c
Headers show

Commit Message

Ricardo Constantino Aug. 5, 2019, 7:47 p.m. UTC
MSYS2 converts paths to MinGW-based applications from unix to
pseudo-windows paths on execution time.
Since there was no space between '-include' and the path, MSYS2 doesn't
detect the path properly.
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Timo Rothenpieler Aug. 5, 2019, 7:57 p.m. UTC | #1
On 05.08.2019 21:47, Ricardo Constantino wrote:
> MSYS2 converts paths to MinGW-based applications from unix to
> pseudo-windows paths on execution time.
> Since there was no space between '-include' and the path, MSYS2 doesn't
> detect the path properly.
> ---
>   configure | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/configure b/configure
> index bddc05b850..34c2adb4a4 100755
> --- a/configure
> +++ b/configure
> @@ -6094,7 +6094,7 @@ fi
>   if enabled cuda_nvcc; then
>       nvccflags="$nvccflags -ptx"
>   else
> -    nvccflags="$nvccflags -S -nocudalib -nocudainc --cuda-device-only -include${source_link}/compat/cuda/cuda_runtime.h"
> +    nvccflags="$nvccflags -S -nocudalib -nocudainc --cuda-device-only -include ${source_link}/compat/cuda/cuda_runtime.h"
>       check_nvcc cuda_llvm
>   fi
>   
> 

Are you sure this is necessary? source_link only ever points to either . 
or src, and I don't see why msys2 would need to fix that, since it's a 
relative path.
Ricardo Constantino Aug. 5, 2019, 8:46 p.m. UTC | #2
On Mon, 5 Aug 2019 at 20:57, Timo Rothenpieler <timo@rothenpieler.org>
wrote:

> On 05.08.2019 21:47, Ricardo Constantino wrote:
> > MSYS2 converts paths to MinGW-based applications from unix to
> > pseudo-windows paths on execution time.
> > Since there was no space between '-include' and the path, MSYS2 doesn't
> > detect the path properly.
> > ---
> >   configure | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/configure b/configure
> > index bddc05b850..34c2adb4a4 100755
> > --- a/configure
> > +++ b/configure
> > @@ -6094,7 +6094,7 @@ fi
> >   if enabled cuda_nvcc; then
> >       nvccflags="$nvccflags -ptx"
> >   else
> > -    nvccflags="$nvccflags -S -nocudalib -nocudainc --cuda-device-only
> -include${source_link}/compat/cuda/cuda_runtime.h"
> > +    nvccflags="$nvccflags -S -nocudalib -nocudainc --cuda-device-only
> -include ${source_link}/compat/cuda/cuda_runtime.h"
> >       check_nvcc cuda_llvm
> >   fi
> >
> >
>
> Are you sure this is necessary? source_link only ever points to either .
> or src, and I don't see why msys2 would need to fix that, since it's a
> relative path.
>

Except symbolic links may not be enabled in MSYS2, so source_link is the
same thing as source_path.
In the case of MSYS2, it would look something like
-include/home/ricardo/ffmpeg and MinGW clang expects it to be converted to
C:\msys64\home\ricardo\ffmpeg, which it doesn't, if there's no space after
-include.


> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
Ricardo Constantino Aug. 5, 2019, 8:47 p.m. UTC | #3
On Mon, 5 Aug 2019 at 21:46, Ricardo Constantino <wiiaboo@gmail.com> wrote:

>
>
> On Mon, 5 Aug 2019 at 20:57, Timo Rothenpieler <timo@rothenpieler.org>
> wrote:
>
>> On 05.08.2019 21:47, Ricardo Constantino wrote:
>> > MSYS2 converts paths to MinGW-based applications from unix to
>> > pseudo-windows paths on execution time.
>> > Since there was no space between '-include' and the path, MSYS2 doesn't
>> > detect the path properly.
>> > ---
>> >   configure | 2 +-
>> >   1 file changed, 1 insertion(+), 1 deletion(-)
>> >
>> > diff --git a/configure b/configure
>> > index bddc05b850..34c2adb4a4 100755
>> > --- a/configure
>> > +++ b/configure
>> > @@ -6094,7 +6094,7 @@ fi
>> >   if enabled cuda_nvcc; then
>> >       nvccflags="$nvccflags -ptx"
>> >   else
>> > -    nvccflags="$nvccflags -S -nocudalib -nocudainc --cuda-device-only
>> -include${source_link}/compat/cuda/cuda_runtime.h"
>> > +    nvccflags="$nvccflags -S -nocudalib -nocudainc --cuda-device-only
>> -include ${source_link}/compat/cuda/cuda_runtime.h"
>> >       check_nvcc cuda_llvm
>> >   fi
>> >
>> >
>>
>> Are you sure this is necessary? source_link only ever points to either .
>> or src, and I don't see why msys2 would need to fix that, since it's a
>> relative path.
>>
>
> Except symbolic links may not be enabled in MSYS2, so source_link is the
> same thing as source_path.
> In the case of MSYS2, it would look something like
> -include/home/ricardo/ffmpeg and MinGW clang expects it to be converted to
> C:\msys64\home\ricardo\ffmpeg, which it doesn't, if there's no space after
> -include.
>

That's why using source_path still wouldn't fix it, btw. I have tested that
possibility.


>
>> _______________________________________________
>> ffmpeg-devel mailing list
>> ffmpeg-devel@ffmpeg.org
>> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>>
>> To unsubscribe, visit link above, or email
>> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
>
>
diff mbox

Patch

diff --git a/configure b/configure
index bddc05b850..34c2adb4a4 100755
--- a/configure
+++ b/configure
@@ -6094,7 +6094,7 @@  fi
 if enabled cuda_nvcc; then
     nvccflags="$nvccflags -ptx"
 else
-    nvccflags="$nvccflags -S -nocudalib -nocudainc --cuda-device-only -include${source_link}/compat/cuda/cuda_runtime.h"
+    nvccflags="$nvccflags -S -nocudalib -nocudainc --cuda-device-only -include ${source_link}/compat/cuda/cuda_runtime.h"
     check_nvcc cuda_llvm
 fi