From 2056aeaaf741b25aeafa047f05fb65b0f66d6ed8 Mon Sep 17 00:00:00 2001 From: benschermel Date: Sat, 13 Nov 2021 19:33:45 +0000 Subject: [PATCH] package updates to release branch Former-commit-id: 1f198c7ea5926f6f7be630da1e0aadbc8abd10ca --- pkg/deb/debian/control | 1 + pkg/deb/debian/rules | 1 + pkg/deb/debian_dh9/control | 6 +----- pkg/deb/debian_dh9/rules | 1 + 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkg/deb/debian/control b/pkg/deb/debian/control index 6354eaa85..78ac65ec4 100644 --- a/pkg/deb/debian/control +++ b/pkg/deb/debian/control @@ -6,6 +6,7 @@ Build-Depends: debhelper (>= 9~), dpkg-dev (>= 1.17.5), systemd, + libsystemd-dev , procps , pkg-config , build-essential , diff --git a/pkg/deb/debian/rules b/pkg/deb/debian/rules index a039b220f..957e05f9a 100755 --- a/pkg/deb/debian/rules +++ b/pkg/deb/debian/rules @@ -3,6 +3,7 @@ include /usr/share/dpkg/buildflags.mk export BUILD_TLS=yes +export USE_SYSTEMD=yes export CFLAGS CPPFLAGS LDFLAGS export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_LDFLAGS_MAINT_APPEND = -ldl -latomic $(LUA_LDFLAGS) diff --git a/pkg/deb/debian_dh9/control b/pkg/deb/debian_dh9/control index 1932b27fe..d61eee87b 100644 --- a/pkg/deb/debian_dh9/control +++ b/pkg/deb/debian_dh9/control @@ -6,11 +6,7 @@ Build-Depends: debhelper (>= 9~), dpkg-dev (>= 1.17.5), systemd, -# libhiredis-dev (>= 0.14.0), -# libjemalloc-dev [linux-any], -# liblua5.1-dev, -# lua-bitop-dev, -# lua-cjson-dev, + libsystemd-dev , procps , build-essential , tcl , diff --git a/pkg/deb/debian_dh9/rules b/pkg/deb/debian_dh9/rules index e6b364993..d1a731196 100755 --- a/pkg/deb/debian_dh9/rules +++ b/pkg/deb/debian_dh9/rules @@ -9,6 +9,7 @@ include /usr/share/dpkg/buildflags.mk #LUA_LDFLAGS = $(addprefix -llua5.1-,$(LUA_LIBS_DEBIAN)) $(addprefix ../deps/lua/src/,$(LUA_OBJECTS)) export BUILD_TLS=yes +export USE_SYSTEMD=yes export CFLAGS CPPFLAGS LDFLAGS export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_LDFLAGS_MAINT_APPEND = -ldl -latomic $(LUA_LDFLAGS)