diff --git a/util/crypt/argon2/actions.py b/util/crypt/argon2/actions.py index 4020e67759..7e18e2febc 100644 --- a/util/crypt/argon2/actions.py +++ b/util/crypt/argon2/actions.py @@ -17,9 +17,9 @@ def build(): #shelltools.export("OS_CXXFLAGS", "%s -fno-strict-aliasing" % get.CXXFLAGS()) shelltools.makedirs("phc-winner-argon2-20190702") - autotools.make() + autotools.make("OPTTARGET='none' LIBRARY_REL='lib' ARGON2_VERSION='%s'" % get.srcVERSION()) def install(): - autotools.rawInstall("DESTDIR=%s LIBDIR=%s/usr/lib" % (get.installDIR(), get.installDIR())) + autotools.rawInstall("DESTDIR=%s LIBRARY_REL='lib' LIBDIR=%s/usr/lib ARGON2_VERSION='%s'" % (get.installDIR(), get.installDIR(), get.srcVERSION())) pisitools.dodoc("LICENSE", "README.md") diff --git a/util/crypt/argon2/pspec.xml b/util/crypt/argon2/pspec.xml index 96752e37d4..b4cbd555a0 100644 --- a/util/crypt/argon2/pspec.xml +++ b/util/crypt/argon2/pspec.xml @@ -27,6 +27,7 @@ /usr/bin + /usr/lib /usr/lib/x86_64-linux-gnu/libargon2* /usr/lib/x86_64-linux-gnu/libargon2.so* /usr/share/doc @@ -41,6 +42,7 @@ /usr/include + /usr/lib/pkgconfig /usr/lib/x86_64-linux-gnu/pkgconfig/libargon2.pc