From patchwork Sat Feb 18 19:13:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 94175 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp703684qgi; Sat, 18 Feb 2017 11:13:31 -0800 (PST) X-Received: by 10.55.27.162 with SMTP id m34mr12533188qkh.276.1487445211771; Sat, 18 Feb 2017 11:13:31 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id c41si9946555qtd.180.2017.02.18.11.13.31; Sat, 18 Feb 2017 11:13:31 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 2A6BA635CD; Sat, 18 Feb 2017 19:13:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 94A6262C2D; Sat, 18 Feb 2017 19:13:28 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 5BEA062F99; Sat, 18 Feb 2017 19:13:26 +0000 (UTC) Received: from mail-lf0-f49.google.com (mail-lf0-f49.google.com [209.85.215.49]) by lists.linaro.org (Postfix) with ESMTPS id 411E060F00 for ; Sat, 18 Feb 2017 19:13:23 +0000 (UTC) Received: by mail-lf0-f49.google.com with SMTP id z134so34787680lff.3 for ; Sat, 18 Feb 2017 11:13:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=/Azo5xoBkj94ICUMKGfS7gfZ5aR9sGEKdijM4ie37og=; b=BhJg85DWocyd0r7DnDa8x/ETJSpNbbyzeUBft8KZmrV8EfIC2KyCND4vlfwff24Dcq kqLhY6WEfJubtUFTXlkN9vX5NdvjudK9bxggveY0zN3VmVanthSDNYCA0pDF7Cg3+g8u 92V8pp2vqwO9IlC3cRATwe6df/x0e1mMjOzQ3RDasI4npY+mWhHRKTj/gksoFq/lJeWk 619JIRIocdYn+z2CzF/VC2ZkeSPnN1g/AMMa1qUpd3clh2RU3Eal4MHQyzGFKrVyPWNc EgQz7ahKxzgiNl16pnPZ1COd5xy+ViB8DUgmM5zK9rKDhr+LM+eo7zyQa1eXf3NIk6D0 ZD9Q== X-Gm-Message-State: AMke39l6p1zY/3hjT0Oi3FYzYiO9rKhib4K6cHZYu9JOwhkrUk50pqd6nXVRXJcj7S5HIEFhh0E= X-Received: by 10.46.80.29 with SMTP id e29mr3226949ljb.78.1487445201406; Sat, 18 Feb 2017 11:13:21 -0800 (PST) Received: from localhost.localdomain (ppp95-165-131-83.pppoe.spdop.ru. [95.165.131.83]) by smtp.gmail.com with ESMTPSA id s7sm3702738lja.27.2017.02.18.11.13.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 18 Feb 2017 11:13:20 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Sat, 18 Feb 2017 22:13:10 +0300 Message-Id: <20170218191310.1627-1-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.11.0.295.gd7dffce Subject: [lng-odp] [PATCH] linux-gen: do not do double symlinks on make distcheck X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Commit: 52f32ce1 linux-gen: abi: add symlink to arch specific dir Fixed applications compilations for installed odp libs and includes with adding symlink. But breaks make distcheck which creates that symlink 2 times and fails on second one because is already exist and that dir does not have write permissions. Current patch skips symlink creation if it's already exist and repairs distcheck. Signed-off-by: Maxim Uvarov --- platform/linux-generic/Makefile.am | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -- 2.11.0.295.gd7dffce diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 04870283..9b053560 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -216,5 +216,9 @@ endif # Create symlink for ABI header files. Application does not need to use the arch # specific include path for installed files. install-data-hook: - $(LN_S) -r $(prefix)/include/odp/arch/@ARCH_ABI@/odp/api/abi \ - $(prefix)/include/odp/api/abi + if [ -h $(prefix)/include/odp/api/abi ]; then \ + pass \ + else \ + $(LN_S) -rf $(prefix)/include/odp/arch/@ARCH_ABI@/odp/api/abi \ + $(prefix)/include/odp/api/abi; \ + fi