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
This commit is contained in:
Adrian Schröter 2014-01-08 15:29:03 +00:00 committed by Git OBS Bridge
parent 84f632d2a6
commit 3c7d87cccf
2 changed files with 8 additions and 2 deletions

View File

@ -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 Wed Dec 18 11:55:23 UTC 2013 - pgajdos@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package ImageMagick # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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] # don't build together, PerlMagick could be miscompiled when using parallel build[1]
# [1] http://pkgs.fedoraproject.org/cgit/ImageMagick.git/tree/ImageMagick.spec # [1] http://pkgs.fedoraproject.org/cgit/ImageMagick.git/tree/ImageMagick.spec
make %{?_smp_mflags} all make %{?_smp_mflags} all
make %{?_smp_mflags} perl-build make -j1 perl-build
%check %check
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/magick/.libs:$PWD/wand/.libs 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 %changelog