Skip to contentSkip to conversation

imagemagick: do not install magick-baseconfig.h repeatedly

PATCH New [email protected] 1 participant 2 messages Sep 19, 2014

lore
Share & tools
lore
#0 lore raw

cover imagemagick: do not install magick-baseconfig.h repeatedly

From: Wenzong Fan <[email protected]>

Both targets install-data-local & install-includeHEADERS will install header file magick-baseconfig.h to the same location, and they might be run in the same time while enabling parallel build:

* target dependencies:
+ install-data-am: ... install-data-local ... install-includeHEADERS

* make install error:
/usr/bin/install: cannot create regular file \
`.../usr/include/ImageMagick-6/magick/magick-baseconfig.h': \
File exists \
make[3]: *** [install-magickincarchHEADERS] Error 1

* reproduce the error:

  $ /usr/bin/install test /tmp & /usr/bin/install test /tmp
  [1] 4052
  /usr/bin/install: cannot create regular file `/tmp/test': File exists
  [1]+  Exit 1                  /usr/bin/install test /tmp

Just disable the one from install-data-local to remove this race issue.

The following changes since commit 28e26a9b0ad37d0c92ba42b2727215eef1edf5a2:

tcpslice: add recipe under tcpdump (2014-09-09 10:32:51 -0400)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib wenzong/imagemagick
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=wenzong/imagemagick

Wenzong Fan (1):
imagemagick: do not install magick-baseconfig.h repeatedly

 ...ot-install-magick-baseconfig.h-repeatedly.patch |   49 ++++++++++++++++++++
 .../imagemagick/imagemagick_6.8.8.bb               |    1 +
 2 files changed, 50 insertions(+)
 create mode 100644 meta-oe/recipes-support/imagemagick/imagemagick/do-not-install-magick-baseconfig.h-repeatedly.patch
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 imagemagick: do not install magick-baseconfig.h repeatedly

From: Wenzong Fan <[email protected]>

Both targets install-data-local & install-includeHEADERS will install header file magick-baseconfig.h to the same location, and they might be run in the same time while enabling parallel build:

* target dependencies:
+ install-data-am: ... install-data-local ... install-includeHEADERS

* make install error:
/usr/bin/install: cannot create regular file \
`.../usr/include/ImageMagick-6/magick/magick-baseconfig.h': \
File exists \
make[3]: *** [install-magickincarchHEADERS] Error 1

* reproduce the error:

  $ /usr/bin/install test /tmp & /usr/bin/install test /tmp
  [1] 4052
  /usr/bin/install: cannot create regular file `/tmp/test': File exists
  [1]+  Exit 1                  /usr/bin/install test /tmp

Just disable the one from install-data-local to remove this race issue.

---
 ...ot-install-magick-baseconfig.h-repeatedly.patch |   49 ++++++++++++++++++++
 .../imagemagick/imagemagick_6.8.8.bb               |    1 +
 2 files changed, 50 insertions(+)
 create mode 100644 meta-oe/recipes-support/imagemagick/imagemagick/do-not-install-magick-baseconfig.h-repeatedly.patch
meta-oe/recipes-support/imagemagick/imagemagick/do-not-install-magick-baseconfig.h-repeatedly.patch new file +49 -0
new file mode 100644
index 0000000..114fb5e
@@ -0,0 +1,49 @@
+From bbdd42384d0b5f3ccb11465f63d90097579a1897 Mon Sep 17 00:00:00 2001
+From: Konrad Scherer <[email protected]>
+Date: Tue, 10 Jun 2014 15:43:16 +0800
+Subject: [PATCH] imagemagick: do not install magick-baseconfig.h repeatedly
+
+Both targets install-data-local & install-includeHEADERS will install
+header file magick-baseconfig.h to the same location, and they might
+be run in the same time while enabling parallel build:
+
+* target dependencies:
+  + install-data-am: ... install-data-local ... install-includeHEADERS
+
+* make install error:
+  /usr/bin/install: cannot create regular file \
+  `.../usr/include/ImageMagick-6/magick/magick-baseconfig.h': \
+  File exists \
+  make[3]: *** [install-magickincarchHEADERS] Error 1
+
+* reproduce the error:
+  $ /usr/bin/install test /tmp & /usr/bin/install test /tmp
+  [1] 4052
+  /usr/bin/install: cannot create regular file `/tmp/test': File exists
+  [1]+  Exit 1                  /usr/bin/install test /tmp
+
+Just disable the one from install-data-local to remove this race issue.
+
+Upstream-Status: pending
+
+Signed-off-by: Wenzong Fan <[email protected]>
+---
+ magick/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/magick/Makefile.am b/magick/Makefile.am
+index 2f72461..e45466c 100644
+--- a/magick/Makefile.am
++++ b/magick/Makefile.am
+@@ -468,7 +468,7 @@ MAGICK_EXTRA_DIST = \
+ 	magick/xwdfile.h_vms 
+ 
+ # Install magick-baseconfig.h
+-MAGICK_INSTALL_DATA_LOCAL_TARGETS = magick-install-data-local
++MAGICK_INSTALL_DATA_LOCAL_TARGETS =
+ magick-install-data-local:
+ 	$(mkinstalldirs) $(DESTDIR)$(magickincarchdir)
+ 	$(INSTALL_HEADER) magick/magick-baseconfig.h $(DESTDIR)$(magickincarchdir)/magick-baseconfig.h
+-- 
+1.8.2.1
+
meta-oe/recipes-support/imagemagick/imagemagick_6.8.8.bb +1 -0
index 31207da..847ab34 100644
@@ -8,6 +8,7 @@ DEPENDS = "lcms bzip2 jpeg libpng librsvg tiff zlib fftw freetype"
 PATCHSET = "10"
 SRC_URI = "http://www.imagemagick.org/download/legacy/ImageMagick-${PV}-${PATCHSET}.tar.bz2 \
            file://remove.dist-lzip.patch \
+           file://do-not-install-magick-baseconfig.h-repeatedly.patch \
 "
 SRC_URI[md5sum] = "a3a0fa301965d6fde68fccd066f62b0b"
 SRC_URI[sha256sum] = "8c0982b2bc0c1cea8ac9627b4e1e5d37f8171ef8282ee09aef32529cf68e1820"
Signature · 1 line
1.7.9.5