From patchwork Wed Apr 24 22:45:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 12895 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 613F7448923 for ; Thu, 25 Apr 2019 01:45:23 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3F36B689D1F; Thu, 25 Apr 2019 01:45:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it1-f177.google.com (mail-it1-f177.google.com [209.85.166.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 65A95689A96 for ; Thu, 25 Apr 2019 01:45:17 +0300 (EEST) Received: by mail-it1-f177.google.com with SMTP id s3so9298956itk.1 for ; Wed, 24 Apr 2019 15:45:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=W59Djt09l7mYcJ84NC5tR9g2Js0/+vp6P3Ab7M72DA4=; b=OOEeDC53gJZNTTu5fZgESM32IOxcXRlcTtyVzrhGCexQpyYlfocznq29NB5wfet+ti ZPQKp028mrDLBWLWBw8bKIZ2eYO24pLHIgdWoUGEtlnptgzOG4Mkf9DWS5GEJTBFFVjK 747qT6m6OrvlL70TgEKuPP1DXNQ0j4Ns0U2g+3d0q9M6YMiK/XyOuB3qkTou46m0C9w9 8zxVaXsDmOuzEGwBS2rNCEMJqlRG5gkQ4dMuLKwDOMUVumbkbT1G/TbOMTm9ouhwekhS hGATRqPuManHceD3wARjtZJiGTtGV2knsoFz7Ahj7vvIh+LOMWcS0FVfMI/i80sc2Cfr ZoVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=W59Djt09l7mYcJ84NC5tR9g2Js0/+vp6P3Ab7M72DA4=; b=OCyqw/oXxEgTD6+d4CBAVVIi36EAdRl6MQE/clBv9zW9jjTcrtuA0vPk1XH/4FMQyY i1FPpg5NY7DptSTahycD7MlHWdn6P2T7bgrcWtN4gmMQSHnDt0YCRg78tjhODuwDblJv d3r8wU708N8v2lFfINIjlH7G3VHlMtBwqlJVOA4CIXSRRxSVE8cAzSR9KxpXeqUrKIi9 51nA7yVBGvcKdD7qHJyl1IA+htLILy7BAtz5rxyzzDq4CdQ1soe8X7W1LSJYdwbyTep6 unC64BJwdJq9ttd8AyOcpH0KBiuOChgtzIKLShnp5IrdwMQNqr27+22VOLVjO+exnl/Z 6oXQ== X-Gm-Message-State: APjAAAVXtatJnEBtSK0saHBa8R41Ec78IyHDExQ3bkrVih54Hw6hn3sm pEQ0BHx7wk92xFMeIHZ7+LXX3rcsE8n+DoLWdbYUaw== X-Google-Smtp-Source: APXvYqz2iURonrHS6tSkhD5r/SBfPv8Sv7eik4qGR8asKaD1pEpL/H2YJ5tbdUDagE0egsKlyvDxiAdWke/5TraDV6Q= X-Received: by 2002:a24:78c8:: with SMTP id p191mr1332112itc.58.1556145915778; Wed, 24 Apr 2019 15:45:15 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a05:6638:97:0:0:0:0 with HTTP; Wed, 24 Apr 2019 15:45:15 -0700 (PDT) From: Carl Eugen Hoyos Date: Thu, 25 Apr 2019 00:45:15 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]configure: Do not overwrite src symlink if it exists X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! Attached patch allows to run fate from wsl for out-of-tree builds. Please comment, Carl Eugen From 8e8742a42a8e945c7d6c90810e6409cbb4210967 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Thu, 25 Apr 2019 00:42:48 +0200 Subject: [PATCH] configure: Do not overwrite src symlink if it already exists. Allows running fate from out-of-tree builds on wsl. --- configure | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 3b11ffe..d2c5100 100755 --- a/configure +++ b/configure @@ -3742,6 +3742,8 @@ mkdir -p ffbuild # find source path if test -f configure; then source_path=. +elif test -f src/configure; then + source_path=src else source_path=$(cd $(dirname "$0"); pwd) case "$source_path" in @@ -5416,7 +5418,7 @@ link_name=$(mktemp -u $TMPDIR/name_XXXXXXXX) mkdir "$link_dest" $ln_s "$link_dest" "$link_name" touch "$link_dest/test_file" -if [ "$source_path" != "." ] && ([ ! -d src ] || [ -L src ]) && [ -e "$link_name/test_file" ]; then +if [ "$source_path" != "." ] && [ "$source_path" != "src" ] && ([ ! -d src ] || [ -L src ]) && [ -e "$link_name/test_file" ]; then # create link to source path [ -e src ] && rm src $ln_s "$source_path" src -- 1.7.10.4