This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 2a4015865143f3f306e4d98859bdc95ba3954ea8 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jan 28 14:58:17 2015 +0100 Support hardened builds for nxcomp* libraries. --- debian/changelog | 2 ++ debian/rules | 10 ++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8d95b5f..1d1078a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -46,6 +46,8 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium no extra settings of LD_LIBRARY_PATH is necessary. + Add Multi-Arch support for Debian based distro versions that support Multi-Arch. + + Support hardened builds for nxcomp* libraries. + * debian/rules: + Backup nxcomp/VERSION file from NoMachine before replacing it with a symlink to debian/VERSION. Recreate the original file when cleaning diff --git a/debian/rules b/debian/rules index f1ec963..acef66c 100755 --- a/debian/rules +++ b/debian/rules @@ -1,13 +1,11 @@ #!/usr/bin/make -f NULL = -CFLAGS = -Wall -g -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif +export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) +export CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) +export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) +export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) export LIBDIR = "/usr/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)" export INCLUDEDIR = "/usr/include/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git