diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2024-02-26 11:24:25 +0800 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2024-02-26 11:24:25 +0800 |
| commit | baae733430abf00cb9d58812d79da7db72c644cf (patch) | |
| tree | 15ab06824cc4803d87420b7c018d6b6616b6d9ed | |
| parent | 74f999af25e9298f6892a940476dff0dcf5207c5 (diff) | |
| download | zxcvbn-c-baae733430abf00cb9d58812d79da7db72c644cf.tar.gz | |
Commit patch queue (exported by git-debrebase)
[git-debrebase make-patches: export and commit patches]
| -rw-r--r-- | debian/patches/makefile-Use-CPPFLAGS_FOR_BUILD-CXXFLAGS_FOR_BUILD.patch | 31 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 32 insertions, 0 deletions
diff --git a/debian/patches/makefile-Use-CPPFLAGS_FOR_BUILD-CXXFLAGS_FOR_BUILD.patch b/debian/patches/makefile-Use-CPPFLAGS_FOR_BUILD-CXXFLAGS_FOR_BUILD.patch new file mode 100644 index 0000000..ddee2e0 --- /dev/null +++ b/debian/patches/makefile-Use-CPPFLAGS_FOR_BUILD-CXXFLAGS_FOR_BUILD.patch @@ -0,0 +1,31 @@ +From: Helmut Grohne <helmut@subdivi.de> +Date: Mon, 8 Jan 2024 08:09:08 +0100 +Subject: makefile: Use CPPFLAGS_FOR_BUILD & CXXFLAGS_FOR_BUILD + +--- + makefile | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/makefile b/makefile +index 5e8ea98..5a5a130 100644 +--- a/makefile ++++ b/makefile +@@ -10,6 +10,9 @@ CXX_FOR_BUILD ?= $(CXX) + # need zxcvbn.h prior to package installation + CPPFLAGS += -I. + ++CPPFLAGS_FOR_BUILD ?= $(CPPFLAGS) ++CXXFLAGS_FOR_BUILD ?= $(CXXFLAGS) ++ + # library metadata + TARGET_LIB = libzxcvbn.so.0.0.0 + SONAME = libzxcvbn.so.0 +@@ -62,7 +65,7 @@ dict-crc.h: dictgen $(WORDS) + ./dictgen -b -o zxcvbn.dict -h dict-crc.h $(WORDS) + + dictgen: dict-generate.cpp makefile +- $(CXX_FOR_BUILD) $(CPPFLAGS) -std=c++11 $(CXXFLAGS) \ ++ $(CXX_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) -std=c++11 $(CXXFLAGS_FOR_BUILD) \ + -o dictgen dict-generate.cpp $(LDFLAGS) + + test-c++inline: test.c zxcvbn-c++inline.o diff --git a/debian/patches/series b/debian/patches/series index 559c234..66236a7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ patch-README-for-Debian.patch cross.patch +makefile-Use-CPPFLAGS_FOR_BUILD-CXXFLAGS_FOR_BUILD.patch |