From 3c7d87cccff1f8770acc7588c8e85b779b5086e0a36898bdd9cfe31e80dfbb05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 8 Jan 2014 15:29:03 +0000 Subject: [PATCH] Accepting request 213183 from openSUSE:Factory:Staging:209471 - really disable parallel build, don't just have a comment about it OBS-URL: https://build.opensuse.org/request/show/213183 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=177 --- ImageMagick.changes | 5 +++++ ImageMagick.spec | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ImageMagick.changes b/ImageMagick.changes index aa5953d..f24d7f2 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 8 14:43:18 UTC 2014 - coolo@suse.com + +- really disable parallel build, don't just have a comment about it + ------------------------------------------------------------------- Wed Dec 18 11:55:23 UTC 2013 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index 547c14b..a3e42ca 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,7 +1,7 @@ # # spec file for package ImageMagick # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -169,7 +169,7 @@ automake # don't build together, PerlMagick could be miscompiled when using parallel build[1] # [1] http://pkgs.fedoraproject.org/cgit/ImageMagick.git/tree/ImageMagick.spec make %{?_smp_mflags} all -make %{?_smp_mflags} perl-build +make -j1 perl-build %check export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/magick/.libs:$PWD/wand/.libs @@ -403,4 +403,5 @@ HTML documentation for ImageMagick library and scene examples. + %changelog