[openturns] 03/04: Re-enable mips and mipsel builds

Denis Barbier barbier-guest at moszumanska.debian.org
Sun Aug 17 23:14:16 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 c86cc556cdb69a5a8135370702a7476a829b6ad4
Author: Denis Barbier <bouzim at gmail.com>
Date:   Wed Aug 13 10:29:55 2014 +0200

    Re-enable mips and mipsel builds
    
    Closes: #753594
---
 debian/rules | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/debian/rules b/debian/rules
index 8cd2f07..c2e89bc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,16 @@
 #!/usr/bin/make -f
 
-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)
+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
 endif
 
 cppflags := $(shell dpkg-buildflags --get CPPFLAGS)
@@ -45,9 +48,10 @@ PYVER = $(shell pyversions -dv)
 
 %:
 ifneq (,$(findstring $(shell dpkg-architecture -qDEB_HOST_ARCH), mips mipsel))
-	$(error This package requires more than 1GB RAM; do not build on mips/mipsel)
-endif
+	dh $@ --buildsystem=cmake --builddirectory=$(builddir) --with python2 --with quilt
+else
 	dh $@ --buildsystem=cmake --builddirectory=$(builddir) --with python2 --with quilt --parallel
+endif
 
 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