[debian-edu-commits] debian-edu/ 01/04: d/p/005-fix-ftbfs-gcc-7.diff: Fix FTBFS with gcc 7.

[Unit 193]

This is an automated email from the git hooks/post-receive script.

unit193-guest pushed a commit to branch master
in repository veracrypt.

commit 1c86ad5daf0c8528c62cf7de1c6fab9032a4a3c8
Author: Unit 193 <unit193 at ubuntu.com>
Date:   Thu Nov 2 20:49:10 2017 -0400

    d/p/005-fix-ftbfs-gcc-7.diff: Fix FTBFS with gcc 7.
---
 debian/patches/005-fix-ftbfs-gcc-7.diff | 20 ++++++++++++++++++++
 debian/patches/series                   |  1 +
 2 files changed, 21 insertions(+)

diff --git a/debian/patches/005-fix-ftbfs-gcc-7.diff b/debian/patches/005-fix-ftbfs-gcc-7.diff
new file mode 100644
index 0000000..be0ff98
--- /dev/null
+++ b/debian/patches/005-fix-ftbfs-gcc-7.diff
@@ -0,0 +1,20 @@
+Description: Fix FTBFS with gcc 7.
+Author: Krytarik Raido <krytarik at tuxgarage.com>
+
+Forwarded: https://github.com/veracrypt/VeraCrypt/issues/198
+Reviewed-By: Unit 193 <unit193 at ubuntu.com>
+Last-Update: 2017-11-02
+
+--- veracrypt-1.21.orig/src/Makefile
++++ veracrypt-1.21/src/Makefile
+@@ -180,8 +180,8 @@ ifeq "$(shell uname -s)" "Linux"
+ 		CFLAGS += -msse2
+ 		CXXFLAGS += -msse2
+ 
+-		GCC_GTEQ_440 := $(shell expr `gcc -dumpversion | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/'` \>= 40400)
+-		GCC_GTEQ_430 := $(shell expr `gcc -dumpversion | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/'` \>= 40300)
++		GCC_GTEQ_440 := $(shell expr `gcc -dumpversion | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/' -e 's/^[0-9]\{1,2\}$$/&0000/'` \>= 40400)
++		GCC_GTEQ_430 := $(shell expr `gcc -dumpversion | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/' -e 's/^[0-9]\{1,2\}$$/&0000/'` \>= 40300)
+ 		ifeq "$(GCC_GTEQ_440)" "1"
+ 			CFLAGS += -maes
+ 			CXXFLAGS += -maes
diff --git a/debian/patches/series b/debian/patches/series
index a572334..283a732 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 002-build-flags.diff
 003-indicator-support.diff
 004-fixup-install.diff
+005-fix-ftbfs-gcc-7.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/veracrypt.git