[ecflow] 01/11: Compile -fPIC on hppa

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository ecflow.

commit 32a1ce742819f75a2e08d40f1b3890912402dbb1
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Oct 13 12:02:33 2017 +0100

    Compile -fPIC on hppa
---
 debian/changelog |  6 ++++++
 debian/rules     | 16 +++++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 34c9f5d..70d5609 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ecflow (4.6.1-3) UNRELEASED; urgency=medium
+
+  * Compile -fPIC on hppa. Closes: #875464
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Mon, 11 Sep 2017 16:19:11 +0100
+
 ecflow (4.6.1-2) unstable; urgency=medium
 
   * Fix FTBFS with g++7. Closes: #873834
diff --git a/debian/rules b/debian/rules
index 7bfcf47..73e1a60 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,20 +6,26 @@ export DH_VERBOSE=1
 %:
 	dh $@ --parallel --with python2,python3 --with-buildsystem=cmake
 
-# export CXX=g++-6
-
-CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS) -DNO_REGEXP
-LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
-CXXFLAGS:= $(shell dpkg-buildflags --get CXXFLAGS) # -std=c++11
 
 DESTDIR:=`pwd`/debian/tmp/
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 LIBDIR:=/usr/lib/$(DEB_HOST_MULTIARCH)
+TARGET_ARCH ?= $(shell dpkg-architecture -qDEB_TARGET_ARCH_CPU)
+
 AUTOGENERATED:= ecflow-server.install ecflow-client.install libecflow-view0d.install
 PY3:=$(shell py3versions -d)
 PY3AB:=$(shell py3versions -d | sed -e 's/python3\./py3/' )
 PY3VER:=$(shell py3versions -d | sed -e 's/python//' ) 
 
+FPIC:= ''
+ifeq ($(TARGET_ARCH), hppa)
+	FPIC:= -fPIC
+endif
+
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) $(FPIC) $(CPPFLAGS) 
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) $(FPIC)
+CXXFLAGS:= $(shell dpkg-buildflags --get CXXFLAGS) $(FPIC) # -std=c++11
+
 CMAKE_COMMON_FLAGS = \
                 -DCMAKE_BUILD_TYPE=Release \
 		-DBOOST_INCLUDEDIR=/usr/include \

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