From 7574d6d1e2afb5d6ac2d8782aae39296480c88b4 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Fri, 13 Jan 2017 19:53:21 +0100 Subject: [PATCH] debian: distribute static libraries Suggested by Jeroen Meijer. * debian/rules: Enable static libraries. * debian/libbddx-dev.install, debian/libspot-dev.install: Distribute them. * THANKS: Add Jeroen. * NEWS: Mention the change. --- NEWS | 3 +++ THANKS | 1 + debian/libbddx-dev.install | 1 + debian/libspot-dev.install | 2 ++ debian/rules | 12 ++++++++++++ 5 files changed, 19 insertions(+) diff --git a/NEWS b/NEWS index afe01ad22..3228d0dc9 100644 --- a/NEWS +++ b/NEWS @@ -11,6 +11,9 @@ New in spot 2.2.2.dev (Not yet released) files. It is still possible to use an external SAT solver by setting the SPOT_SATSOLVER environment variable. + * The development Debian packages for Spot now install static + libraries as well. + Tools: * ltlcross supports translators that output alternating automata in diff --git a/THANKS b/THANKS index 98d23b3d5..3d7c104d7 100644 --- a/THANKS +++ b/THANKS @@ -17,6 +17,7 @@ Heikki Tauriainen Jan Strejček Jean-Michel Couvreur Jean-Michel Ilié +Jeroen Meijer Joachim Klein Juraj Major Kristin Y. Rozier diff --git a/debian/libbddx-dev.install b/debian/libbddx-dev.install index 65c8bb0c4..b278da165 100644 --- a/debian/libbddx-dev.install +++ b/debian/libbddx-dev.install @@ -2,3 +2,4 @@ usr/include/fddx.h usr/include/bvecx.h usr/include/bddx.h usr/lib/*-*/libbddx.so +usr/lib/*-*/libbddx.a diff --git a/debian/libspot-dev.install b/debian/libspot-dev.install index 1042d0eeb..9894e81e3 100644 --- a/debian/libspot-dev.install +++ b/debian/libspot-dev.install @@ -1,3 +1,5 @@ usr/include/spot usr/lib/*-*/libspot.so +usr/lib/*-*/libspot.a usr/lib/*-*/libspotltsmin.so +usr/lib/*-*/libspotltsmin.a diff --git a/debian/rules b/debian/rules index b8aa0869d..6976acd4e 100755 --- a/debian/rules +++ b/debian/rules @@ -79,6 +79,18 @@ override_dh_auto_install: fix-js dh_auto_build -- -C python all; \ dh_auto_install -- -C python; \ done +# Reconfigure to build static libraries. We can't build them +# alongside dynamic libraries, otherwise they will be stuffed with +# LTO stuff that is just two big to distribute. And we cannot use +# the profile generated with LTO on, so we simply build without it. + dh_auto_configure -- \ + --disable-devel --enable-optimizations \ + --disable-shared --enable-static --disable-python + dh_auto_build -- clean + dh_auto_build -- all + dh_auto_install -- -C buddy + dh_auto_install -- -C spot +# Just remove the Libtool libraries until someone asks for them. find debian/tmp -name '*.la' -exec rm -rv {} ';' override_dh_python3: dh_python3 -p python3-spot