diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2016-09-24 16:19:39 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2016-09-24 16:19:39 -0700 |
| commit | fa97c8522d72b6a98ddfba094d3371424caaaf47 (patch) | |
| tree | d776526f9efd42c08c9684a00732261eede2caa7 /debian | |
| parent | dec161acbad673a7e0b32ff2f12d18a9da76813b (diff) | |
| download | zxcvbn-c-fa97c8522d72b6a98ddfba094d3371424caaaf47.tar.gz | |
fix building & testing static lib
Previous approach sometimes led to a test-statlib that wouldn't
execute.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/patches/targets-to-build-shlib.patch | 2 | ||||
| -rw-r--r-- | debian/patches/targets-to-build-static-lib.patch | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/debian/patches/targets-to-build-shlib.patch b/debian/patches/targets-to-build-shlib.patch index 1182c74..8550085 100644 --- a/debian/patches/targets-to-build-shlib.patch +++ b/debian/patches/targets-to-build-shlib.patch @@ -9,7 +9,7 @@ This patch adds targets to build a shared library, instead. 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/makefile b/makefile -index 2b06881..c438f1a 100644 +index 2b06881..d8cf510 100644 --- a/makefile +++ b/makefile @@ -1,9 +1,24 @@ diff --git a/debian/patches/targets-to-build-static-lib.patch b/debian/patches/targets-to-build-static-lib.patch index 9a8c7ce..0dbfa49 100644 --- a/debian/patches/targets-to-build-static-lib.patch +++ b/debian/patches/targets-to-build-static-lib.patch @@ -7,7 +7,7 @@ Subject: targets to build static lib 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/makefile b/makefile -index c438f1a..c2b5df1 100644 +index d8cf510..fe7dda1 100644 --- a/makefile +++ b/makefile @@ -11,7 +11,7 @@ SONAME = libzxcvbn.so.0 @@ -24,10 +24,10 @@ index c438f1a..c2b5df1 100644 gcc $(CFLAGS) $(LDFLAGS) -fPIC -shared -Wl,-soname,$(SONAME) -o $@ $^ -lm +test-statlib: test.c libzxcvbn.a -+ gcc $(CFLAGS) $(LDFLAGS) -static -o $@ test.c -L. -lzxcvbn -lm ++ gcc $(CFLAGS) $(LDFLAGS) -o $@ $^ -lm + +libzxcvbn.a: zxcvbn-inline.o -+ ar rcs $@ $^ ++ ar cvq $@ $^ + test-file: test.c zxcvbn-file.o gcc $(CFLAGS) -DUSE_DICT_FILE -o test-file test.c zxcvbn-file.o -lm |