From 9eea3db339d2e5298a8e340ccbefa4523b51252b Mon Sep 17 00:00:00 2001 From: Gard Spreemann Date: Fri, 27 Aug 2021 16:10:48 +0200 Subject: Revert "Use buildtools.mk to set Fortran compiler instead of hardcoding" This reverts commit df7b0486dcc08ab5c8dc586302bd395ab756df92. See discussion in https://lists.debian.org/debian-cross/2021/08/msg00009.html --- debian/rules | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 0ef9b97..3d5d285 100755 --- a/debian/rules +++ b/debian/rules @@ -13,16 +13,14 @@ 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) --include /usr/share/dpkg/buildtools.mk - %: dh $@ build/%.o: %.f - $(FC) $(FCFLAGS) -fPIC -o $@ -c $< + gfortran $(FCFLAGS) -fPIC -o $@ -c $< build/liblbfgsb.so: build/lbfgsb.o build/timer.o - $(FC) $(FCFLAGS) -shared $(LDFLAGS) -Wl,-soname,$(SONAME) \ + gfortran $(FCFLAGS) -shared $(LDFLAGS) -Wl,-soname,$(SONAME) \ -o build/$(SONAME) $^ -lblas -llapack ln -s $(SONAME) $@ @@ -30,22 +28,22 @@ build/liblbfgsb.a: build/lbfgsb.o build/timer.o $(AR) cr $@ $^ build/lbfgsb-examples_driver1_77: driver1.f build/liblbfgsb.so - $(FC) $(FCFLAGS_EX) $(LDFLAGS_EX) -o $@ $< -llbfgsb -Lbuild + gfortran $(FCFLAGS_EX) $(LDFLAGS_EX) -o $@ $< -llbfgsb -Lbuild build/lbfgsb-examples_driver1_90: driver1.f90 build/liblbfgsb.so - $(FC) $(FCFLAGS_EX) $(LDFLAGS_EX) -o $@ $< -llbfgsb -Lbuild + gfortran $(FCFLAGS_EX) $(LDFLAGS_EX) -o $@ $< -llbfgsb -Lbuild build/lbfgsb-examples_driver2_77: driver2.f build/liblbfgsb.so - $(FC) $(FCFLAGS_EX) $(LDFLAGS_EX) -o $@ $< -llbfgsb -Lbuild + gfortran $(FCFLAGS_EX) $(LDFLAGS_EX) -o $@ $< -llbfgsb -Lbuild build/lbfgsb-examples_driver2_90: driver2.f90 build/liblbfgsb.so - $(FC) $(FCFLAGS_EX) $(LDFLAGS_EX) -o $@ $< -llbfgsb -Lbuild + gfortran $(FCFLAGS_EX) $(LDFLAGS_EX) -o $@ $< -llbfgsb -Lbuild build/lbfgsb-examples_driver3_77: driver3.f build/liblbfgsb.so - $(FC) $(FCFLAGS_EX) $(LDFLAGS_EX) -o $@ $< -llbfgsb -Lbuild + gfortran $(FCFLAGS_EX) $(LDFLAGS_EX) -o $@ $< -llbfgsb -Lbuild build/lbfgsb-examples_driver3_90: driver3.f90 build/liblbfgsb.so - $(FC) $(FCFLAGS_EX) $(LDFLAGS_EX) -o $@ $< -llbfgsb -Lbuild + gfortran $(FCFLAGS_EX) $(LDFLAGS_EX) -o $@ $< -llbfgsb -Lbuild execute_before_dh_auto_build: mkdir -p build -- cgit v1.2.3