diff --git a/srcpkgs/argon2/patches/libdir.patch b/srcpkgs/argon2/patches/libdir.patch index 6998392b5cf..31b86db3eb8 100644 --- a/srcpkgs/argon2/patches/libdir.patch +++ b/srcpkgs/argon2/patches/libdir.patch @@ -4,18 +4,18 @@ --- Makefile +++ Makefile -@@ -140,14 +140,6 @@ - - else ifeq ($(KERNEL_NAME)-$(MACHINE_NAME), Linux-x86_64) +@@ -138,14 +138,6 @@ + LIBRARY_REL ?= lib + PKGCONFIG_REL ?= libdata +-else ifeq ($(KERNEL_NAME)-$(MACHINE_NAME), Linux-x86_64) +- -# default for Debian/Ubuntu x86_64 -BINARY_REL ?= bin -INCLUDE_REL ?= include -LIBRARY_REL ?= lib/x86_64-linux-gnu -PKGCONFIG_REL ?= $(LIBRARY_REL) - --else -- + else + # NetBSD, ... and Linux64/Linux32 variants that use plain lib directory - BINARY_REL ?= bin - INCLUDE_REL ?= include diff --git a/srcpkgs/argon2/template b/srcpkgs/argon2/template index 3c3cc7e61df..7529ea7f375 100644 --- a/srcpkgs/argon2/template +++ b/srcpkgs/argon2/template @@ -1,7 +1,7 @@ # Template file for 'argon2' pkgname=argon2 version=20190702 -revision=1 +revision=2 wrksrc="phc-winner-argon2-${version}" build_style=gnu-makefile make_use_env=yes