From patchwork Sun May 18 20:24:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 350022 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id A9A671400AF for ; Mon, 19 May 2014 06:24:20 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C51118AF67; Sun, 18 May 2014 20:24:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jxuoj3RGHUsF; Sun, 18 May 2014 20:24:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 9FCE98AD44; Sun, 18 May 2014 20:24:18 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 2D66E1BF9E7 for ; Sun, 18 May 2014 20:24:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 2B2D788E33 for ; Sun, 18 May 2014 20:24:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QRB-HJ3RoHiH for ; Sun, 18 May 2014 20:24:16 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from smtp1-g21.free.fr (smtp1-g21.free.fr [212.27.42.1]) by hemlock.osuosl.org (Postfix) with ESMTP id CA57388D2E for ; Sun, 18 May 2014 20:24:15 +0000 (UTC) Received: from localhost.localdomain (unknown [81.57.22.125]) by smtp1-g21.free.fr (Postfix) with ESMTP id 94EAD940126; Sun, 18 May 2014 22:22:52 +0200 (CEST) From: Romain Naour To: buildroot@buildroot.org Date: Sun, 18 May 2014 22:24:10 +0200 Message-Id: <1400444650-29600-1-git-send-email-romain.naour@openwide.fr> X-Mailer: git-send-email 1.9.0 Subject: [Buildroot] [PATCH 1/1] package/imagemagick: remove useless makefile target. X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Makefile's target "install-magickincarchHEADERS" and "magick-install-data-local" install both the same file (magick-baseconfig.h) in the same time... The problem can be reproduced with: mkdir /tmp/bar /usr/bin/install -c -m 644 foo /tmp/bar & /usr/bin/install -c -m 644 foo /tmp/bar/foo /usr/bin/install: cannot create regular file '/tmp/bar/foo' : File exists So, remove one of them. Fixes: http://autobuild.buildroot.net/results/d34/d34077ce582866c50bbd90de10bbe593e39463f1/build-end.log Signed-off-by: Romain Naour --- ...2-remove-magick-install-data-local-target.patch | 56 ++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 package/imagemagick/imagemagick-02-remove-magick-install-data-local-target.patch diff --git a/package/imagemagick/imagemagick-02-remove-magick-install-data-local-target.patch b/package/imagemagick/imagemagick-02-remove-magick-install-data-local-target.patch new file mode 100644 index 0000000..11b4d46 --- /dev/null +++ b/package/imagemagick/imagemagick-02-remove-magick-install-data-local-target.patch @@ -0,0 +1,56 @@ +From 8f8f73265b281b0a01f1b6bfe8ec189b24fe75c0 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sun, 18 May 2014 20:44:26 +0200 +Subject: [PATCH 1/1] Remove magick-install-data-local target. + +The magick-baseconfig.h is already installed by install-magickincarchHEADERS target. +This cause a race condition by calling install command twice to copy the same file at the same location at the same time. + +Fixes: +http://autobuild.buildroot.net/results/d34/d34077ce582866c50bbd90de10bbe593e39463f1/build-end.log + +Signed-off-by: Romain Naour +--- + Makefile.am | 4 ++-- + magick/Makefile.am | 12 ------------ + 2 files changed, 2 insertions(+), 14 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 0741336..f9598b6 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -184,9 +184,9 @@ all-local: $(MAGICKPP_LOCAL_TARGETS) $(PERLMAGICK_ALL_LOCAL_TARGETS) $(MAINTAINE + + install-exec-local: $(PERLMAGICK_INSTALL_EXEC_LOCAL_TARGETS) + +-install-data-local: $(MAGICK_INSTALL_DATA_LOCAL_TARGETS) $(PERLMAGICK_INSTALL_DATA_LOCAL_TARGETS) $(HTML_INSTALL_DATA_TARGETS) ++install-data-local: $(PERLMAGICK_INSTALL_DATA_LOCAL_TARGETS) $(HTML_INSTALL_DATA_TARGETS) + +-uninstall-local: $(MAGICK_UNINSTALL_LOCAL_TARGETS) $(PERLMAGICK_UNINSTALL_LOCAL_TARGETS) $(HTML_UNINSTALL_DATA_TARGETS) ++uninstall-local: $(PERLMAGICK_UNINSTALL_LOCAL_TARGETS) $(HTML_UNINSTALL_DATA_TARGETS) + + clean-local: $(PERLMAGICK_CLEAN_LOCAL_TARGETS) + +diff --git a/magick/Makefile.am b/magick/Makefile.am +index 4c6360b..2e389f2 100644 +--- a/magick/Makefile.am ++++ b/magick/Makefile.am +@@ -471,15 +471,3 @@ MAGICK_EXTRA_DIST = \ + magick/nt-feature.c \ + magick/vms.c \ + magick/xwdfile.h_vms +- +-# Install magick-baseconfig.h +-MAGICK_INSTALL_DATA_LOCAL_TARGETS = magick-install-data-local +-magick-install-data-local: +- $(mkinstalldirs) $(DESTDIR)$(magickincarchdir) +- $(INSTALL_HEADER) magick/magick-baseconfig.h $(DESTDIR)$(magickincarchdir)/magick-baseconfig.h +- +-# Uninstall magick-config.h +-MAGICK_UNINSTALL_LOCAL_TARGETS = magick-uninstall-local +-magick-uninstall-local: +- rm -f $(DESTDIR)$(magickincarchdir)/magick-baseconfig.h +- +-- +1.9.0 +