[feel++] 122/122: fix powerpc build, upload 0.97beta1

[Mattia Rizzolo]

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

mattia pushed a commit to branch master
in repository feel++.

commit 852956b673357d8dfd291844f2bb84cd22e13edd
Author: Christophe Prudhomme <prudhomm at debian.org>
Date:   Sun Mar 9 20:49:28 2014 +0000

    fix powerpc build, upload 0.97beta1
---
 debian/changelog | 24 ++++++++++++++++++++++++
 debian/control   |  2 +-
 debian/rules     | 15 ++++++++++-----
 3 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9d11a7f..227a6dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+feel++ (1:0.97.0-beta.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Christophe Prud'homme <prudhomm at debian.org>  Sun, 09 Mar 2014 20:32:12 +0000
+
+feel++ (1:0.97.0-alpha.3-3) unstable; urgency=medium
+
+  * try harder to fix powerpc build
+
+ -- Christophe Prud'homme <prudhomm at debian.org>  Fri, 07 Mar 2014 13:29:06 +0000
+
+feel++ (1:0.97.0-alpha.3-2) unstable; urgency=medium
+
+  * try fixing powerpc build
+
+ -- Christophe Prud'homme <prudhomm at debian.org>  Wed, 26 Feb 2014 15:18:54 +0000
+
+feel++ (1:0.97.0-alpha.3-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Christophe Prud'homme <prudhomm at debian.org>  Wed, 26 Feb 2014 12:21:05 +0000
+
 feel++ (1:0.97.0-alpha.1+git5a4f83e-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 34e6d45..d0601cb 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends: cdbs, quilt, debhelper (>= 7), cmake (>=2.6), g++-4.8, clang-3.4|
 	       doxygen, doxygen-latex,
 	       transfig,imagemagick,
 	       libtbb-dev[amd64 i386],
-	       libopenturns-dev, libann-dev, libglpk-dev
+	       libann-dev, libglpk-dev
 Standards-Version: 3.9.4
 Homepage: http://www.feelpp.org
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/feel++/trunk
diff --git a/debian/rules b/debian/rules
index 5b98031..cc28ffa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,17 +3,18 @@
 DEB_AUTO_CLEANUP_RCS   := yes
 DEB_COMPRESS_EXCLUDE   := .pdf
 
+DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_BUILD_ARCH_OS := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
+DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 
-DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-DEB_BUILD_ARCH_OS := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
-DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
 PETSC_ARCH=$(DEB_BUILD_GNU_SYSTEM)
 
+
 FEELPP_INSTALL_ENABLERS=-DBUILD_TESTING=OFF                  \
 			-DFEELPP_ENABLE_DOXYGEN=ON          \
 			-DFEELPP_ENABLE_DOCUMENTATION=ON       \
@@ -28,18 +29,22 @@ DEB_CMAKE_EXTRA_FLAGS=                      \
 	$(CURDIR)/$(DEB_SRCDIR)
 
 ifeq (,$(filter $(DEB_HOST_ARCH),sparc))
+ifeq (,$(filter $(DEB_HOST_ARCH),powerpc))	
 DEB_CMAKE_EXTRA_FLAGS+=\
 		-DCMAKE_CXX_COMPILER=/usr/bin/clang++ \
 		-DCMAKE_CXX_FLAGS_RELEASE="-O2 -DNDEBUG -g0"
 else
 DEB_CMAKE_EXTRA_FLAGS+=\
+		-DCMAKE_CXX_COMPILER=/usr/bin/clang++ \
+		-DCMAKE_CXX_FLAGS_RELEASE="-O2 -DNDEBUG -g0  -fno-stack-protector"
+endif
+else
+DEB_CMAKE_EXTRA_FLAGS+=\
 		-DCMAKE_CXX_COMPILER=/usr/bin/g++-4.8 \
 		-DCMAKE_CXX_FLAGS_RELEASE="-Og -DNDEBUG"
 endif
 
 
-
-
 #build/feel++-apps::
 #	-cd $(DEB_BUILDDIR) && ctest -D Experimental
 

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