[perl-PDL] Fix parallel build in Basic/Core directory
Petr Pisar
ppisar at fedoraproject.org
Tue Feb 10 14:06:39 UTC 2015
commit d0ec478fe0b313cc91d0aeae908ccb43b5e02261
Author: Petr Písař <ppisar at redhat.com>
Date: Tue Feb 10 15:04:05 2015 +0100
Fix parallel build in Basic/Core directory
...Declare-dependecies-on-generated-header-f.patch | 48 ++++++++++++++++++++
perl-PDL.spec | 9 +++-
2 files changed, 56 insertions(+), 1 deletions(-)
---
diff --git a/PDL-2.007-Basic-Core-Declare-dependecies-on-generated-header-f.patch b/PDL-2.007-Basic-Core-Declare-dependecies-on-generated-header-f.patch
new file mode 100644
index 0000000..82b2d35
--- /dev/null
+++ b/PDL-2.007-Basic-Core-Declare-dependecies-on-generated-header-f.patch
@@ -0,0 +1,48 @@
+From ef7e9cbf22fbe947b123303329efb114198a8757 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Tue, 10 Feb 2015 14:38:29 +0100
+Subject: [PATCH] Basic/Core: Declare dependecies on generated header files
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Parallel build can fail because generated C sources requires generated
+header files. This patch adds the missing dependency declarations.
+
+Signed-off-by: Petr Písař <ppisar at redhat.com>
+---
+ Basic/Core/Makefile.PL | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/Basic/Core/Makefile.PL b/Basic/Core/Makefile.PL
+index a6fc6bc..795ed2c 100644
+--- a/Basic/Core/Makefile.PL
++++ b/Basic/Core/Makefile.PL
+@@ -258,18 +258,21 @@ PDL::Core::Dev::postamble().
+ # there must be a more elegant way of saying that
+ # certain files have additional dependencies!
+
+-pdlthread.c :: pdlcore.h\n"
++pdlthread.c :: pdl.h pdlcore.h\n"
+ ."
+
+-pdlhash.c :: pdlcore.h\n"
++pdlhash.c :: pdl.h pdlcore.h\n"
+ ."
+
+-pdlapi.c :: pdlcore.h\n"
++pdlapi.c :: pdl.h pdlcore.h\n"
+ ."
+
+ pdlmagic.c :: pdlcore.h\n"
+ ."
+
++pdlsections.c :: pdl.h pdlcore.h\n"
++."
++
+ Core.pm :: Core.pm.PL Types.pm badsupport.p\n"
+ . make_from_PL('Core.pm')
+ ."
+--
+1.9.3
+
diff --git a/perl-PDL.spec b/perl-PDL.spec
index 84eeebe..0e97602 100644
--- a/perl-PDL.spec
+++ b/perl-PDL.spec
@@ -11,7 +11,7 @@
Name: perl-PDL
%global cpan_version 2.007
Version: 2.7.0
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: The Perl Data Language
Group: Development/Libraries
License: GPL+ or Artistic
@@ -29,6 +29,9 @@ Patch4: PDL-2.7.0-Disable-PDL-Slatec.patch
# Skip PDL::Slatec reverse dependencies if Slatec is disabled, bug #1041304,
# https://sourceforge.net/p/pdl/bugs/350/
Patch5: PDL-2.7.0-Do-not-install-modules-using-PDL-Slatec-if-Slatec-is.patch
+# Fix parallel build in Basic/Core directory,
+# https://sourceforge.net/p/pdl/bugs/370/
+Patch6: PDL-2.007-Basic-Core-Declare-dependecies-on-generated-header-f.patch
BuildRequires: fftw2-devel
BuildRequires: freeglut-devel
BuildRequires: gcc-gfortran
@@ -157,6 +160,7 @@ such commercial packages as IDL and MatLab.
%patch4 -p1 -b .slatec
%endif
%patch5 -p1 -b .slatec_revdep
+%patch6 -p1
# Fix shebang
sed -e 's,^#!/usr/bin/env perl,#!/usr/bin/perl,' -i Perldl2/pdl2
@@ -195,6 +199,9 @@ make test
%{_mandir}/man3/*.3*
%changelog
+* Tue Feb 10 2015 Petr Pisar <ppisar at redhat.com> - 2.7.0-8
+- Fix parallel build in Basic/Core directory
+
* Tue Feb 10 2015 Petr Pisar <ppisar at redhat.com> - 2.7.0-7
- Run-require ExtUtils::MakeMaker for script generated by pptemplate tool
More information about the scm-commits
mailing list