Sat Aug 29 09:32:35 2020 UTC ()
b2sum: Fix build on non-x86


(nia)
diff -r1.2 -r1.3 pkgsrc/sysutils/b2sum/Makefile
diff -r1.1 -r1.2 pkgsrc/sysutils/b2sum/distinfo
diff -r0 -r1.1 pkgsrc/sysutils/b2sum/patches/patch-makefile
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/b2sum/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/b2sum/Makefile 2016/09/08 14:31:22 1.2
+++ pkgsrc/sysutils/b2sum/Makefile 2020/08/29 09:32:35 1.3
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: Makefile,v 1.2 2016/09/08 14:31:22 jperkin Exp $ 1# $NetBSD: Makefile,v 1.3 2020/08/29 09:32:35 nia Exp $
2 2
3DISTNAME= b2sum-20160619 3DISTNAME= b2sum-20160619
 4PKGREVISION= 1
4CATEGORIES= sysutils 5CATEGORIES= sysutils
5MASTER_SITES= ${MASTER_SITE_GITHUB:=BLAKE2/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=BLAKE2/}
6GITHUB_PROJECT= BLAKE2 7GITHUB_PROJECT= BLAKE2
7GITHUB_TAG= ${PKGVERSION_NOREV} 8GITHUB_TAG= ${PKGVERSION_NOREV}
8 9
9MAINTAINER= wiedi@frubar.net 10MAINTAINER= wiedi@frubar.net
10HOMEPAGE= https://blake2.net/ 11HOMEPAGE= https://blake2.net/
11COMMENT= BLAKE2 b2sum utility 12COMMENT= BLAKE2 b2sum utility
12LICENSE= cc0-1.0-universal 13LICENSE= cc0-1.0-universal
13 14
14USE_LANGUAGES= c99 
15MAKE_FILE= makefile 15MAKE_FILE= makefile
16MAKE_ENV+= MANDIR=${PREFIX}/${PKGMANDIR} 16MAKE_ENV+= MANDIR=${PREFIX}/${PKGMANDIR}
17MAKE_ENV+= NO_OPENMP=1 17MAKE_ENV+= NO_OPENMP=1
18 18
19WRKSRC= ${WRKDIR}/BLAKE2-${PKGVERSION_NOREV}/b2sum 19WRKSRC= ${WRKDIR}/BLAKE2-${PKGVERSION_NOREV}/b2sum
20 20
21.include "../../mk/bsd.pkg.mk" 21.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/b2sum/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/b2sum/distinfo 2016/07/25 10:07:23 1.1
+++ pkgsrc/sysutils/b2sum/distinfo 2020/08/29 09:32:35 1.2
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.1 2016/07/25 10:07:23 wiedi Exp $ 1$NetBSD: distinfo,v 1.2 2020/08/29 09:32:35 nia Exp $
2 2
3SHA1 (b2sum-20160619-20160619.tar.gz) = 9b09b144adcc472e2e0df08521d51bd8e87315b4 3SHA1 (b2sum-20160619-20160619.tar.gz) = 9b09b144adcc472e2e0df08521d51bd8e87315b4
4RMD160 (b2sum-20160619-20160619.tar.gz) = b321ea9c6861dd8590475ac0178f4fa3702afb95 4RMD160 (b2sum-20160619-20160619.tar.gz) = b321ea9c6861dd8590475ac0178f4fa3702afb95
5SHA512 (b2sum-20160619-20160619.tar.gz) = ed3457b59cd3d8351ad9d69d396072575057e711ef03ed25fea482758d09b8e69dbae059f4f5b5475629f7f01a44609d90445741276c81b1f4f0226fbd188bd9 5SHA512 (b2sum-20160619-20160619.tar.gz) = ed3457b59cd3d8351ad9d69d396072575057e711ef03ed25fea482758d09b8e69dbae059f4f5b5475629f7f01a44609d90445741276c81b1f4f0226fbd188bd9
6Size (b2sum-20160619-20160619.tar.gz) = 462704 bytes 6Size (b2sum-20160619-20160619.tar.gz) = 462704 bytes
 7SHA1 (patch-makefile) = 5808e9fe034eaca447acecbcc6df9007a9d05042
File Added: pkgsrc/sysutils/b2sum/patches/patch-makefile
$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)