diff options
| author |  Unit 193 <unit193@ubuntu.com> | 2018-03-30 22:31:30 -0400 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2018-03-30 22:31:30 -0400 |
| commit | f5bd0d88ae58d6aab3b235eef0868b1976874afd (patch) | |
| tree | 6fe667098e1b47f6c9b2f67e4ced3b918b89bc40 | |
| parent | 153207d53884b50e1ec7a54054277dcd6cd39f17 (diff) | |
| download | veracrypt-f5bd0d88ae58d6aab3b235eef0868b1976874afd.tar.bz2 veracrypt-f5bd0d88ae58d6aab3b235eef0868b1976874afd.tar.xz veracrypt-f5bd0d88ae58d6aab3b235eef0868b1976874afd.tar.zst | |
d/p/005-fix-ftbfs-gcc-7.diff: Drop, applied upstream.
| -rw-r--r-- | debian/patches/005-fix-ftbfs-gcc-7.diff | 20 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 0 insertions, 21 deletions
diff --git a/debian/patches/005-fix-ftbfs-gcc-7.diff b/debian/patches/005-fix-ftbfs-gcc-7.diff deleted file mode 100644 index be0ff98..0000000 --- a/debian/patches/005-fix-ftbfs-gcc-7.diff +++ /dev/null @@ -1,20 +0,0 @@ -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 283a732..a572334 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,4 +2,3 @@ 002-build-flags.diff 003-indicator-support.diff 004-fixup-install.diff -005-fix-ftbfs-gcc-7.diff |