[flint] 02/02: inject compile flags (workaround broken makefiles)

[felix salfelder]

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

felix-guest pushed a commit to branch master
in repository flint.

commit 19abb574f9c4391137d941f19cfcefa7dd51fdc6
Author: Bernhard R. Link <brlink at debian.org>
Date:   Tue May 27 21:32:34 2014 +0200

    inject compile flags (workaround broken makefiles)
---
 debian/rules | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/rules b/debian/rules
index 303260a..16f5bd0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,18 @@
 #!/usr/bin/make -f
 
 VERSION=2.4.3
-LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
-EXTRA_SHARED_FLAGS=-Wl,-soname,libflint-$(VERSION).so $(LDFLAGS)
-MAKE_OVERRIDE = AT= QUIET_CXX= QUIET_CC= QUIET_AR= INCS=-I$(CURDIR)
+EXTRA_SHARED_FLAGS=-Wl,-soname,libflint-$(VERSION).so
+MAKE_OVERRIDE = AT= QUIET_CXX= QUIET_CC= QUIET_AR= INCS=-I$(CURDIR) \
+                ABI_FLAG='$(LDFLAGS)'
 
 %:
 	dh $@
 
+# upstream Makefile has only CFLAGS, not CPPFLAGS and not even CXXFLAGS, so
+# inject flags using configure. let's hope CFLAGS will always be good enough
+# even for $(CXX)
 override_dh_auto_configure:
-	./configure --prefix="/usr" --with-ntl
+	./configure --prefix="/usr" --with-ntl CFLAGS='$(CPPFLAGS) $(CFLAGS)'
 	sed -i Makefile -e "/^FLINT_LIB\>=/s/libflint/libflint-$(VERSION)/"
 
 override_dh_auto_build:

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