CVS commit: pkgsrc/sysutils/b2sum

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Aug 29 09:32:35 UTC 2020

Modified Files:
        pkgsrc/sysutils/b2sum: Makefile distinfo
Added Files:
        pkgsrc/sysutils/b2sum/patches: patch-makefile

Log Message:
b2sum: Fix build on non-x86


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/b2sum/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/b2sum/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/b2sum/patches/patch-makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/b2sum/Makefile
diff -u pkgsrc/sysutils/b2sum/Makefile:1.2 pkgsrc/sysutils/b2sum/Makefile:1.3
--- pkgsrc/sysutils/b2sum/Makefile:1.2  Thu Sep  8 14:31:22 2016
+++ pkgsrc/sysutils/b2sum/Makefile      Sat Aug 29 09:32:35 2020
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2016/09/08 14:31:22 jperkin Exp $
+# $NetBSD: Makefile,v 1.3 2020/08/29 09:32:35 nia Exp $
 
 DISTNAME=      b2sum-20160619
+PKGREVISION=   1
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=BLAKE2/}
 GITHUB_PROJECT=        BLAKE2
@@ -11,7 +12,6 @@ HOMEPAGE=     https://blake2.net/
 COMMENT=       BLAKE2 b2sum utility
 LICENSE=       cc0-1.0-universal
 
-USE_LANGUAGES= c99
 MAKE_FILE=     makefile
 MAKE_ENV+=     MANDIR=${PREFIX}/${PKGMANDIR}
 MAKE_ENV+=     NO_OPENMP=1

Index: pkgsrc/sysutils/b2sum/distinfo
diff -u pkgsrc/sysutils/b2sum/distinfo:1.1 pkgsrc/sysutils/b2sum/distinfo:1.2
--- pkgsrc/sysutils/b2sum/distinfo:1.1  Mon Jul 25 10:07:23 2016
+++ pkgsrc/sysutils/b2sum/distinfo      Sat Aug 29 09:32:35 2020
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2016/07/25 10:07:23 wiedi Exp $
+$NetBSD: distinfo,v 1.2 2020/08/29 09:32:35 nia Exp $
 
 SHA1 (b2sum-20160619-20160619.tar.gz) = 9b09b144adcc472e2e0df08521d51bd8e87315b4
 RMD160 (b2sum-20160619-20160619.tar.gz) = b321ea9c6861dd8590475ac0178f4fa3702afb95
 SHA512 (b2sum-20160619-20160619.tar.gz) = ed3457b59cd3d8351ad9d69d396072575057e711ef03ed25fea482758d09b8e69dbae059f4f5b5475629f7f01a44609d90445741276c81b1f4f0226fbd188bd9
 Size (b2sum-20160619-20160619.tar.gz) = 462704 bytes
+SHA1 (patch-makefile) = 5808e9fe034eaca447acecbcc6df9007a9d05042

Added files:

Index: pkgsrc/sysutils/b2sum/patches/patch-makefile
diff -u /dev/null pkgsrc/sysutils/b2sum/patches/patch-makefile:1.1
--- /dev/null   Sat Aug 29 09:32:35 2020
+++ pkgsrc/sysutils/b2sum/patches/patch-makefile        Sat Aug 29 09:32:35 2020
@@ -0,0 +1,20 @@
+$NetBSD: patch-makefile,v 1.1 2020/08/29 09:32:35 nia Exp $
+
+Build ref rather than sse version, so this works on non-x86
+
+--- makefile.orig      2016-06-19 16:55:55.000000000 +0000
++++ makefile
+@@ -6,11 +6,10 @@ NO_OPENMP_0=-fopenmp
+ NO_OPENMP_1=
+ CC?=gcc
+ CFLAGS?=-O3 -march=native -Werror=declaration-after-statement
+-CFLAGS+=-std=c99 -I../sse
++CFLAGS+=-std=c99 -I../ref
+ CFLAGS+=$(NO_OPENMP_$(NO_OPENMP))
+ LIBS=
+-#FILES=b2sum.c ../ref/blake2b-ref.c ../ref/blake2s-ref.c ../ref/blake2bp-ref.c ../ref/blake2sp-ref.c 
+-FILES=b2sum.c ../sse/blake2b.c ../sse/blake2s.c ../sse/blake2bp.c ../sse/blake2sp.c 
++FILES=b2sum.c ../ref/blake2b-ref.c ../ref/blake2s-ref.c ../ref/blake2bp-ref.c ../ref/blake2sp-ref.c 
+ all: $(FILES)
+       $(CC) $(FILES) $(CFLAGS) $(LIBS) -o $(PROG)
+