diff options
| author |  Unit 193 <unit193@ubuntu.com> | 2017-11-02 20:49:10 -0400 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2017-11-02 20:49:10 -0400 |
| commit | 1c86ad5daf0c8528c62cf7de1c6fab9032a4a3c8 (patch) | |
| tree | 17246d179fb10935d8be50ef57980acb18278473 | |
| parent | 5d9d2049c08253b4685f66e684c085db95f9b4f0 (diff) | |
| download | veracrypt-1c86ad5daf0c8528c62cf7de1c6fab9032a4a3c8.tar.bz2 veracrypt-1c86ad5daf0c8528c62cf7de1c6fab9032a4a3c8.tar.xz veracrypt-1c86ad5daf0c8528c62cf7de1c6fab9032a4a3c8.tar.zst | |
d/p/005-fix-ftbfs-gcc-7.diff: Fix FTBFS with gcc 7.
| -rw-r--r-- | debian/patches/005-fix-ftbfs-gcc-7.diff | 20 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 21 insertions, 0 deletions
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@tuxgarage.com> + +Forwarded: https://github.com/veracrypt/VeraCrypt/issues/198 +Reviewed-By: Unit 193 <unit193@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 |