From e01da2df1050738942abfacfc2cef3bdf92ca880 Mon Sep 17 00:00:00 2001 From: Alexei Lozovsky Date: Mon, 13 Jul 2020 21:33:45 +0300 Subject: [PATCH 1/2] Move static libs and link files into dev packages Normally the "library" packages on Debian an RHEL contain only shared library files. Headers, static libraries, and shared library links go into the "development" package which is necessary to build software that uses the library (but not run it). On RHEL the static libraries are often moved into their own "-static" package to avoid bloating the "-devel" package (as dynamic linkage is customary). Historically, we've been putting everything into the "library" package but let's follow the conventions from now on. We already recommend to install "development" packages to develop software that uses Themis. Some language wrappers -- dynamic languages like Python and Ruby -- will need that as they resolve Themis dynamic library dynamically and need the symlink to be present. --- CHANGELOG.md | 4 ++++ Makefile | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a45876f8..57f19d06b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ Changes that are currently in development and have not been released yet. +_Infrastructure:_ + +- Improved package split make `libthemis` thinner ([#678](https://github.com/cossacklabs/themis/pull/678)). + ## [0.13.0](https://github.com/cossacklabs/themis/releases/tag/0.13.0), July 8th 2020 **TL;DR:** diff --git a/Makefile b/Makefile index b05de2e09..fe03790d4 100644 --- a/Makefile +++ b/Makefile @@ -660,13 +660,13 @@ POST_UNINSTALL_SCRIPT := $(BIN_PATH)/post_uninstall.sh DEV_PACKAGE_FILES += $(includedir)/soter/ DEV_PACKAGE_FILES += $(includedir)/themis/ DEV_PACKAGE_FILES += $(pkgconfigdir)/ +DEV_PACKAGE_FILES += $(libdir)/$(LIBSOTER_A) +DEV_PACKAGE_FILES += $(libdir)/$(LIBSOTER_LINK) +DEV_PACKAGE_FILES += $(libdir)/$(LIBTHEMIS_A) +DEV_PACKAGE_FILES += $(libdir)/$(LIBTHEMIS_LINK) -LIB_PACKAGE_FILES += $(libdir)/$(LIBSOTER_A) LIB_PACKAGE_FILES += $(libdir)/$(LIBSOTER_SO) -LIB_PACKAGE_FILES += $(libdir)/$(LIBSOTER_LINK) -LIB_PACKAGE_FILES += $(libdir)/$(LIBTHEMIS_A) LIB_PACKAGE_FILES += $(libdir)/$(LIBTHEMIS_SO) -LIB_PACKAGE_FILES += $(libdir)/$(LIBTHEMIS_LINK) THEMISPP_PACKAGE_FILES += $(includedir)/themispp/ From 18c4c08c18b5e6a4debbeedf6395524545f3c2b0 Mon Sep 17 00:00:00 2001 From: Alexei Lozovsky Date: Tue, 14 Jul 2020 17:12:46 +0300 Subject: [PATCH 2/2] Update CHANGELOG.md Co-authored-by: vixentael --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 57f19d06b..15628dbc5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ Changes that are currently in development and have not been released yet. _Infrastructure:_ -- Improved package split make `libthemis` thinner ([#678](https://github.com/cossacklabs/themis/pull/678)). +- Improved package split making `libthemis` thinner ([#678](https://github.com/cossacklabs/themis/pull/678)). ## [0.13.0](https://github.com/cossacklabs/themis/releases/tag/0.13.0), July 8th 2020