diff options
author | Unit 193 <unit193@ubuntu.com> | 2018-10-07 08:45:57 -0400 |
---|---|---|
committer | Unit 193 <unit193@ubuntu.com> | 2018-10-07 08:45:57 -0400 |
commit | 20b1f04e7f192e51c6be160dc3441d367e97b4e4 (patch) | |
tree | 42002a9323ad1cf0b5be23f5697fd3302178a314 | |
parent | 8ee63227cd5aaca433f80a80f9a663343b2c67e7 (diff) | |
download | veracrypt-20b1f04e7f192e51c6be160dc3441d367e97b4e4.tar.bz2 veracrypt-20b1f04e7f192e51c6be160dc3441d367e97b4e4.tar.xz veracrypt-20b1f04e7f192e51c6be160dc3441d367e97b4e4.tar.zst |
d/p/series, d/rules: Drop patch in favor of packing (C,CXX,LD)FLAGS into TC_EXTRA_$1.
-rw-r--r-- | debian/patches/002-build-flags.diff | 34 | ||||
-rw-r--r-- | debian/patches/002-indicator-support.diff (renamed from debian/patches/003-indicator-support.diff) | 0 | ||||
-rw-r--r-- | debian/patches/003-fixup-install.diff (renamed from debian/patches/004-fixup-install.diff) | 0 | ||||
-rw-r--r-- | debian/patches/series | 5 | ||||
-rwxr-xr-x | debian/rules | 4 |
5 files changed, 6 insertions, 37 deletions
diff --git a/debian/patches/002-build-flags.diff b/debian/patches/002-build-flags.diff deleted file mode 100644 index 20c8362..0000000 --- a/debian/patches/002-build-flags.diff +++ /dev/null @@ -1,34 +0,0 @@ -From: Stefan Sundin <stefan@stefansundin.com> -Date: Fri, 12 Sept 2013 -Subject: Add build flags - -Forwarded: no - -Index: veracrypt/src/Makefile -=================================================================== ---- veracrypt.orig/src/Makefile -+++ veracrypt/src/Makefile -@@ -57,6 +57,10 @@ export WXCONFIG_CFLAGS := - export WXCONFIG_CXXFLAGS := - WX_ROOT ?= .. - -+CPPFLAGS+=$(shell dpkg-buildflags --get CPPFLAGS) -+CFLAGS+=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS) -Wno-sequence-point -+CXXFLAGS+=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS) -Wno-narrowing -+LFLAGS+=$(shell dpkg-buildflags --get LDFLAGS) - - export TC_BUILD_CONFIG := Release - -Index: veracrypt/src/Build/Include/Makefile.inc -=================================================================== ---- veracrypt.orig/src/Build/Include/Makefile.inc -+++ veracrypt/src/Build/Include/Makefile.inc -@@ -14,7 +14,7 @@ $(NAME): $(NAME).a - - clean: - @echo Cleaning $(NAME) -- rm -f $(APPNAME) $(NAME).a $(OBJS) $(OBJSEX) $(OBJS:.o=.d) *.gch -+ rm -f $(APPNAME) $(NAME).a $(OBJS) $(OBJS:.o=.d) *.gch $(RESOURCES) SystemPrecompiled.d - - %.o: %.c - @echo Compiling $(<F) diff --git a/debian/patches/003-indicator-support.diff b/debian/patches/002-indicator-support.diff index 858f3af..858f3af 100644 --- a/debian/patches/003-indicator-support.diff +++ b/debian/patches/002-indicator-support.diff diff --git a/debian/patches/004-fixup-install.diff b/debian/patches/003-fixup-install.diff index 8257d10..8257d10 100644 --- a/debian/patches/004-fixup-install.diff +++ b/debian/patches/003-fixup-install.diff diff --git a/debian/patches/series b/debian/patches/series index a572334..bb302ae 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ 001-user-guide-location.diff -002-build-flags.diff -003-indicator-support.diff -004-fixup-install.diff +002-indicator-support.diff +003-fixup-install.diff diff --git a/debian/rules b/debian/rules index 5cb3e9e..58ba42d 100755 --- a/debian/rules +++ b/debian/rules @@ -8,6 +8,10 @@ include /usr/share/dpkg/buildflags.mk export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed +export TC_EXTRA_CFLAGS = $(CFLAGS) +export TC_EXTRA_CXXFLAGS = $(CXXFLAGS) +export TC_EXTRA_LFLAGS = $(LDFLAGS) + %: dh $@ --sourcedirectory=src |