On 26.01.2016 21:28, Michael Niedermayer wrote:
> On Mon, Jan 25, 2016 at 08:51:32PM +0100, Andreas Cadhalpun wrote:
>> ffmpeg | branch: master | Andreas Cadhalpun
>> <andreas.cadhal...@googlemail.com> | Mon Jan 25 01:42:23 2016 +0100|
>> [b46aae093634271931395d65f422f4b2a23112d3] | committer: Andreas Cadhalpun
>>
>> build: use a link instead of changing current directory when compiling
>>
>> If links don't work, fall back to using the full source path as was
>> previously done.
>>
>> This should fix build failures with MSVC.
>>
>> Reviewed-by: Hendrik Leppkes <h.lepp...@gmail.com>
>> Signed-off-by: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
>>
>>> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b46aae093634271931395d65f422f4b2a23112d3
>> ---
>
> if you have a "src" directory this results in:
> ./configure
> rm: cannot remove `src': Is a directory
> ln: `src/.': cannot overwrite directory
I guess you'd like to keep the src directory in that case.
Attached is a patch falling back to using the full path then.
Best regards,
Andreas
>From 72b2b0c9533d96b778be4c96a418b22075f1d39a Mon Sep 17 00:00:00 2001
From: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
Date: Tue, 26 Jan 2016 22:54:01 +0100
Subject: [PATCH] configure: fall back to using full path if src is a directory
Signed-off-by: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
---
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure b/configure
index 73d4dcf..0c2746b 100755
--- a/configure
+++ b/configure
@@ -4707,7 +4707,7 @@ link_name=$(mktemp -u $TMPDIR/name_XXXXXXXX)
mkdir "$link_dest"
$ln_s "$link_dest" "$link_name"
touch "$link_dest/test_file"
-if [ -e "$link_name/test_file" ]; then
+if [ ! -d src ] && [ -e "$link_name/test_file" ]; then
# create link to source path
[ -e src ] && rm src
$ln_s "$source_path" src
--
2.7.0.rc3
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
