diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2018-09-08 11:35:01 -0700 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2018-09-08 11:35:01 -0700 |
commit | 3e21e764ce071225e34d3102ef6691b54302f21a (patch) | |
tree | 42d9e4f54e17dccc7619dc469e2f2982a0a3240b /debian/patches/cross.patch | |
parent | b976403f5c302ff65f4800eb932c26e11eea60e2 (diff) | |
download | zxcvbn-c-3e21e764ce071225e34d3102ef6691b54302f21a.tar.gz |
Commit patch queue (exported by git-debrebase)
[git-debrebase make-patches: export and commit patches]
Diffstat (limited to 'debian/patches/cross.patch')
-rw-r--r-- | debian/patches/cross.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/debian/patches/cross.patch b/debian/patches/cross.patch new file mode 100644 index 0000000..cd46962 --- /dev/null +++ b/debian/patches/cross.patch @@ -0,0 +1,29 @@ +From: Helmut Grohne <helmut@subdivi.de> +Date: Sun, 25 Mar 2018 13:36:47 +0200 +Subject: fix crossbuilding zxcvbn-c + +--- + makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/makefile b/makefile +index 40c88f2..6223330 100644 +--- a/makefile ++++ b/makefile +@@ -5,6 +5,7 @@ CXXFLAGS ?= -O2 -Wall -Wextra + CC ?= gcc + AR ?= ar + CXX ?= g++ ++CXX_FOR_BUILD ?= $(CXX) + + # need zxcvbn.h prior to package installation + CPPFLAGS += -I. +@@ -61,7 +62,7 @@ dict-crc.h: dictgen $(WORDS) + ./dictgen -b -o zxcvbn.dict -h dict-crc.h $(WORDS) + + dictgen: dict-generate.cpp makefile +- $(CXX) $(CPPFLAGS) -std=c++11 $(CXXFLAGS) \ ++ $(CXX_FOR_BUILD) $(CPPFLAGS) -std=c++11 $(CXXFLAGS) \ + -o dictgen dict-generate.cpp $(LDFLAGS) + + test-c++inline: test.c zxcvbn-c++inline.o |