[openturns] 01/02: Revert "Re-enable mips and mipsel builds"

Denis Barbier barbier-guest at moszumanska.debian.org
Sun Nov 23 11:05:52 UTC 2014


This is an automated email from the git hooks/post-receive script.

barbier-guest pushed a commit to branch debian
in repository openturns.

commit 71eff45781c3d37308607fab2eee589eb46fcd3d
Author: Denis Barbier <bouzim at gmail.com>
Date:   Sat Aug 23 00:34:12 2014 +0200

    Revert "Re-enable mips and mipsel builds"
    
    This reverts commit c86cc556cdb69a5a8135370702a7476a829b6ad4.
    
    Mipsel failed to build OT 1.4-2, and mips did not try to
    build after 10 days.
---
 debian/rules | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/debian/rules b/debian/rules
index c2e89bc..8cd2f07 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,13 @@
 #!/usr/bin/make -f
 
-ifneq (,$(findstring $(shell dpkg-architecture -qDEB_HOST_ARCH), mips mipsel))
-    $(info Do not use parallel build for mips and mipsel.)
-else
-    ifeq ($(findstring parallel=,$(DEB_BUILD_OPTIONS)),)
-        export DEB_BUILD_OPTIONS+=parallel=$(shell getconf _NPROCESSORS_ONLN)
-    endif
-    $(info DEB_BUILD_OPTIONS:$(origin DEB_BUILD_OPTIONS)=$(DEB_BUILD_OPTIONS))
-    ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-        NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-        test_makeflags = -j$(NUMJOBS)
-    endif
+ifeq ($(findstring parallel=,$(DEB_BUILD_OPTIONS)),)
+	export DEB_BUILD_OPTIONS+=parallel=$(shell getconf _NPROCESSORS_ONLN)
+endif
+$(info DEB_BUILD_OPTIONS:$(origin DEB_BUILD_OPTIONS)=$(DEB_BUILD_OPTIONS))
+
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	test_makeflags = -j$(NUMJOBS)
 endif
 
 cppflags := $(shell dpkg-buildflags --get CPPFLAGS)
@@ -48,10 +45,9 @@ PYVER = $(shell pyversions -dv)
 
 %:
 ifneq (,$(findstring $(shell dpkg-architecture -qDEB_HOST_ARCH), mips mipsel))
-	dh $@ --buildsystem=cmake --builddirectory=$(builddir) --with python2 --with quilt
-else
-	dh $@ --buildsystem=cmake --builddirectory=$(builddir) --with python2 --with quilt --parallel
+	$(error This package requires more than 1GB RAM; do not build on mips/mipsel)
 endif
+	dh $@ --buildsystem=cmake --builddirectory=$(builddir) --with python2 --with quilt --parallel
 
 debian/tmp/usr/lib/R/site-library/rot:
 	-mkdir -p $(debRlib)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/openturns.git



More information about the debian-science-commits mailing list