From 24a48c9f1e47cd22b064350f661b219ea66280c8 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Sat, 28 Sep 2019 08:11:51 +0200 Subject: [PATCH] debian: remove -flo workaround * debian/rules: Here. --- debian/rules | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/debian/rules b/debian/rules index 05adcf1d0..b4b922d7e 100755 --- a/debian/rules +++ b/debian/rules @@ -45,17 +45,6 @@ PRO2SETUP = \ PYDEFAULT=$(shell py3versions --default) PYOTHERS=$(filter-out $(PYDEFAULT), $(shell py3versions --supported)) -# There seem to be a problem with unwinding of exception handling when -# the binaries are compiled with -flto. For instance in autfilt, -# argp_parse() calls the locally defined parse_opt() that calls -# remove_ap::add_ap() (in libspot). The latter may throw an -# exception, which should be caught in main(). However If autfilt is -# compiled with -flto, the exception never traverses argp. Moving -# the try/catch block inside parse_opt() also fixes this praticular -# problem, but who knows about other exceptions? So as a workaround, -# we simply disable -flto in bin/. -FLTOWORKAROUND = perl -pi -e s/-flto// bin/Makefile - # We want to build Spot twice: once to get profile data, and a second # time to use it. override_dh_auto_configure: @@ -63,14 +52,12 @@ override_dh_auto_configure: dh_auto_configure -- $(PRO1SETUP) $(LTOSETUP) \ --disable-devel --enable-optimizations \ --disable-static PYTHON=/usr/bin/$(PYDEFAULT) - $(FLTOWORKAROUND) dh_auto_build dh_auto_test make clean dh_auto_configure -- $(PRO2SETUP) $(LTOSETUP) \ --disable-devel --enable-optimizations \ --disable-static PYTHON=/usr/bin/$(PYDEFAULT) - $(FLTOWORKAROUND) override_dh_auto_install: fix-js dh_auto_install --destdir=$(CURDIR)/debian/tmp # Reconfigure for every other supported Python3 version,