From 593e15ca1c93c83ae5629de450c2c92f7ca3ab56 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 22 Jun 2016 10:09:17 +0200 Subject: debian/*: Drop non-multi-arch support (i.e. Debian squeeze, Ubuntu 10.04 and earlier). --- debian/rules | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 275956c9a..f8bec8fc0 100755 --- a/debian/rules +++ b/debian/rules @@ -19,23 +19,11 @@ override_dh_auto_clean: override_dh_clean: rm -f nx*/configure - . ./replace.sh; set -x; ls debian/*.install.in | while read file; do rm -f $$(string_rep $$file .install.in .install); done rm -fR .preserve/ dh_clean override_dh_install: - # handle builds for Debian squeeze (non multi-arch) - . ./replace.sh; set -x; if [ -z "$(DEB_BUILD_MULTIARCH)" ]; then \ - find debian/*.install.in | while read file; do \ - cat $$file | sed -e 's#/\*/#/#g' > $$(string_rep $$file .install.in .install); \ - done; \ - else \ - find debian/*.install.in | while read file; do \ - cat $$file > $$(string_rep $$file .install.in .install); \ - done; \ - fi - # remove static libs rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcomp.a rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcompshad.a -- cgit v1.2.3 From 908b930c9e0cb336e6f18d2c8ff7d19f52f7accc Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 22 Jun 2016 10:10:49 +0200 Subject: debian/rules: Don't attempt at removing $(CURDIR)/.preserve/. Not needed anymore since we removed the CODE-REDUCTION_* hacks from debian/rules. --- debian/rules | 1 - 1 file changed, 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index f8bec8fc0..ec7616f7a 100755 --- a/debian/rules +++ b/debian/rules @@ -19,7 +19,6 @@ override_dh_auto_clean: override_dh_clean: rm -f nx*/configure - rm -fR .preserve/ dh_clean override_dh_install: -- cgit v1.2.3 From 7d66941aebf923a3311a07671e69160487c3f8f0 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 23 Jun 2016 21:09:19 +0200 Subject: debian/rules: Use buildflags.mk from dpkg-dev. Enable bindnow hardening flag. --- debian/rules | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index ec7616f7a..e41f97c81 100755 --- a/debian/rules +++ b/debian/rules @@ -2,10 +2,9 @@ NULL = -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 DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk export LIBDIR = "/usr/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)" export INCLUDEDIR = "/usr/include/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)" -- cgit v1.2.3