diff options
Diffstat (limited to 'scx-veracrypt/veracrypt-1.21-dumpfullversion.patch')
| -rw-r--r-- | scx-veracrypt/veracrypt-1.21-dumpfullversion.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/scx-veracrypt/veracrypt-1.21-dumpfullversion.patch b/scx-veracrypt/veracrypt-1.21-dumpfullversion.patch new file mode 100644 index 0000000..ad0df26 --- /dev/null +++ b/scx-veracrypt/veracrypt-1.21-dumpfullversion.patch @@ -0,0 +1,23 @@ +diff -Naur a/src/Makefile b/src/Makefile +--- a/src/Makefile 2017-10-24 01:20:32.657585146 +0200 ++++ b/src/Makefile 2017-10-24 01:24:08.136642573 +0200 +@@ -167,8 +167,8 @@ + 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 -dumpfullversion | 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 -dumpfullversion | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/'` \>= 40300) + ifeq "$(GCC_GTEQ_440)" "1" + CFLAGS += -maes + CXXFLAGS += -maes +@@ -202,7 +202,7 @@ + ifneq "$(origin WXSTATIC)" "command line" + LFLAGS += -ldl + else +- GCC5USED := $(shell expr `gcc -dumpversion | cut -f1 -d.` \>= 5) ++ GCC5USED := $(shell expr `gcc -dumpfullversion | cut -f1 -d.` \>= 5) + ifeq "$(GCC5USED)" "1" + CXXFLAGS += -D_GLIBCXX_USE_CXX11_ABI=0 + WXCONFIG_CXXFLAGS += -D_GLIBCXX_USE_CXX11_ABI=0 |