From b3d0cecb29b48d8d4d0dd0f1748a91476001697d Mon Sep 17 00:00:00 2001
From: Gard Spreemann <gspr@nonempty.org>
Date: Wed, 20 Jul 2022 13:10:33 +0200
Subject: Simplify build flags

---
 debian/changelog |  6 ++++++
 debian/rules     | 24 ++++++++----------------
 2 files changed, 14 insertions(+), 16 deletions(-)

(limited to 'debian')

diff --git a/debian/changelog b/debian/changelog
index 6ea6ca7..5de7bb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+lbfgsb (3.0+dfsg.3-11) UNRELEASED; urgency=medium
+
+  * Simplify build flags.
+
+ -- Gard Spreemann <gspr@nonempty.org>  Wed, 20 Jul 2022 13:10:19 +0200
+
 lbfgsb (3.0+dfsg.3-10) unstable; urgency=medium
 
   [ Debian Janitor ]
diff --git a/debian/rules b/debian/rules
index 60d2ed6..a706e04 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,16 +2,8 @@
 
 SONAME=liblbfgsb.so.0
 
-# Enable hardening, but remove pie flag since we're building a shared
-# object.  See also
-# https://lists.debian.org/debian-devel/2013/01/msg00225.html.
-MAINTOPTS = hardening=+all,-pie
-FCFLAGS:=$(shell DEB_BUILD_MAINT_OPTIONS=$(MAINTOPTS) dpkg-buildflags --get FCFLAGS)
-LDFLAGS:=$(shell DEB_BUILD_MAINT_OPTIONS=$(MAINTOPTS) dpkg-buildflags --get LDFLAGS)
-
-MAINTOPTS_EX = hardening=+all
-FCFLAGS_EX:=$(shell DEB_BUILD_MAINT_OPTIONS=$(MAINTOPTS_EX) dpkg-buildflags --get FCFLAGS)
-LDFLAGS_EX:=$(shell DEB_BUILD_MAINT_OPTIONS=$(MAINTOPTS_EX) dpkg-buildflags --get LDFLAGS)
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+include /usr/share/dpkg/buildflags.mk
 
 %:
 	dh $@
@@ -28,22 +20,22 @@ build/liblbfgsb.a: build/lbfgsb.o build/timer.o
 	ar cr $@ $^
 
 build/lbfgsb-examples_driver1_77: driver1.f build/liblbfgsb.so
-	gfortran $(FCFLAGS_EX) $(LDFLAGS_EX) -o $@ $< -llbfgsb -Lbuild
+	gfortran $(FCFLAGS) $(LDFLAGS) -o $@ $< -llbfgsb -Lbuild
 
 build/lbfgsb-examples_driver1_90: driver1.f90 build/liblbfgsb.so
-	gfortran $(FCFLAGS_EX) $(LDFLAGS_EX) -o $@ $< -llbfgsb -Lbuild
+	gfortran $(FCFLAGS) $(LDFLAGS) -o $@ $< -llbfgsb -Lbuild
 
 build/lbfgsb-examples_driver2_77: driver2.f build/liblbfgsb.so
-	gfortran $(FCFLAGS_EX) $(LDFLAGS_EX) -o $@ $< -llbfgsb -Lbuild
+	gfortran $(FCFLAGS) $(LDFLAGS) -o $@ $< -llbfgsb -Lbuild
 
 build/lbfgsb-examples_driver2_90: driver2.f90 build/liblbfgsb.so
-	gfortran $(FCFLAGS_EX) $(LDFLAGS_EX) -o $@ $< -llbfgsb -Lbuild
+	gfortran $(FCFLAGS) $(LDFLAGS) -o $@ $< -llbfgsb -Lbuild
 
 build/lbfgsb-examples_driver3_77: driver3.f build/liblbfgsb.so
-	gfortran $(FCFLAGS_EX) $(LDFLAGS_EX) -o $@ $< -llbfgsb -Lbuild
+	gfortran $(FCFLAGS) $(LDFLAGS) -o $@ $< -llbfgsb -Lbuild
 
 build/lbfgsb-examples_driver3_90: driver3.f90 build/liblbfgsb.so
-	gfortran $(FCFLAGS_EX) $(LDFLAGS_EX) -o $@ $< -llbfgsb -Lbuild
+	gfortran $(FCFLAGS) $(LDFLAGS) -o $@ $< -llbfgsb -Lbuild
 
 execute_before_dh_auto_build:
 	mkdir -p build
-- 
cgit v1.2.3