[csisat] Parallel make still isn't fixed; disable until I can figure it out.
Jerry James
jjames at fedoraproject.org
Thu Jan 27 20:20:45 UTC 2011
commit aef551856d77b6bb3e0dec8599ca50cacdb2c8fb
Author: Jerry James <loganjerry at gmail.com>
Date: Thu Jan 27 13:20:05 2011 -0700
Parallel make still isn't fixed; disable until I can figure it out.
csisat.spec | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/csisat.spec b/csisat.spec
index c2bb0f6..8915e98 100644
--- a/csisat.spec
+++ b/csisat.spec
@@ -12,7 +12,7 @@ Source0: http://csisat.googlecode.com/files/%{name}-%{version}.zip
# instead, and also adds missing dependencies so that parallel make works.
Patch0: csisat-makefile.patch
-BuildRequires: glpk-devel, ocaml, picosat-devel
+BuildRequires: glpk-devel, ocaml, picosat-devel, subversion
# Exclude arches where ocaml is not available
ExcludeArch: sparc64 s390 s390x
@@ -47,8 +47,8 @@ chmod a-x *.txt
find . -name \*.c | xargs chmod a-x
%build
-make %{?_smp_mflags} \
- CFLAGS="$RPM_OPT_FLAGS -I%{_libdir}/ocaml -I%{_includedir}/glpk"
+# FIXME: Parallel make sometimes fails
+make CFLAGS="$RPM_OPT_FLAGS -I%{_libdir}/ocaml -I%{_includedir}/glpk"
%install
rm -rf $RPM_BUILD_ROOT
@@ -67,6 +67,8 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Thu Jan 27 2011 Jerry James <loganjerry at gmail.com> - 1.2-3
- Rebuild for new picosat and new ocaml
+- BR subversion to eliminate build noise from svnversion failing
+- Parallel make still isn't fixed; disable until I can figure it out
* Tue Jan 19 2010 Jerry James <loganjerry at gmail.com> - 1.2-2
- Fix parallel make
More information about the scm-commits
mailing list