[ode] 01/03: Changed the method to obtain the Bits. DEB_HOST_ARCH_BITS it's much better. Thanks to Guillem Jover and James Cowgill.

[Leopold Palomo-Avellaneda]

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

lepalom-guest pushed a commit to branch master
in repository ode.

commit 27d6dd7225e4d739acec88ca1cfe9b890a62cc3a
Author: Leopold Palomo-Avellaneda <leopold.palomo at upc.edu>
Date:   Thu Sep 10 13:23:06 2015 +0200

    Changed the method to obtain the Bits. DEB_HOST_ARCH_BITS it's much better. Thanks to Guillem Jover and  James Cowgill.
---
 debian/rules | 40 +++++++---------------------------------
 1 file changed, 7 insertions(+), 33 deletions(-)

diff --git a/debian/rules b/debian/rules
index 7ded5a3..b8b6db6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,42 +5,25 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
-CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
-CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
-LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
-
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
-
-DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+EB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_GNU_TYPE=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 # Multiarch.
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+# Num biits
+DEB_HOST_ARCH_BITS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS)
 
-#Arch 32 bits
-# armel armhf i386 powerpc powerpcspe sh4 
-
-#Arch 64 bits
-# alpha arm64 hppa mips mipsel ppc64 ppc64el s390x x32
 
 CONFIG_OPTS = --enable-double-precision
 
-ifeq ($(DEB_HOST_ARCH), armel )
-	CONFIG_OPTS = ""
-else ifeq ($(DEB_HOST_ARCH), armhf )
-	CONFIG_OPTS = ""
-else ifeq ($(DEB_HOST_ARCH), i386 )
-	CONFIG_OPTS = "" 
-else ifeq ($(DEB_HOST_ARCH), powerpc)
-        CONFIG_OPTS = ""
-else ifeq ($(DEB_HOST_ARCH), powerpcspe)
-	CONFIG_OPTS = ""
-else ifeq ($(DEB_HOST_ARCH), sh4)
-	CONFIG_OPTS = ""
+ifeq ($(DEB_HOST_ARCH_BITS),32)
+	CONFIG_OPTS = --enable-single-precision
+else
+	CONFIG_OPTS = --enable-double-precision
 endif
 
 CONFIG_OPTS += --prefix=/usr \
@@ -51,12 +34,6 @@ CONFIG_OPTS += --prefix=/usr \
 		    --enable-static \
                     --libdir='$${prefix}/lib/$(DEB_HOST_MULTIARCH)/'
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CXXFLAGS += -O0 -g3
-	CFLAGS += -O0 -g3
-	export CXXFLAGS CFLAGS
-endif
-
 %:
 	dh $@ --parallel --with autotools-dev
 
@@ -68,6 +45,3 @@ override_dh_auto_build:
 	dh_auto_build
 	docbook-to-man debian/ode-config.man.sgml > debian/ode-config.1
 
-override_dh_auto_clean:
-	dh_auto_clean
-	rm debian/ode-config.1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ode.git