Attachment 157321 Details for Bug 200561 – sysutils/b2sum improvements

[patch] sysutils/b2sum improvements

sysutils-b2sum.patch (text/plain), 3.13 KB, created by Matthew Rezny on 2015-06-01 02:28:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Rezny

Created: 2015-06-01 02:28:53 UTC

Size: 3.13 KB

patch

obsolete

>Index: sysutils/b2sum/Makefile
>===================================================================
>--- sysutils/b2sum/Makefile	(revision 388164)
>+++ sysutils/b2sum/Makefile	(working copy)
>@@ -1,25 +1,50 @@
> # $FreeBSD$
> 
> PORTNAME=	b2sum
>-PORTVERSION=	0.0.d${DISTVERSION}
>-DISTVERSION=	20150529
>-DISTNAME=	blake2_code_${DISTVERSION}${EXTRACT_SUFFX}
>+PORTVERSION=	0.0.d${B2VERSION}
> CATEGORIES=	sysutils security
> MASTER_SITES=	http://blake2.net/
>+DISTNAME=	blake2_code_${B2VERSION}${EXTRACT_SUFFX}
> 
>-MAINTAINER=	bapt@FreeBSD.org
>-COMMENT=	fast secure hashing
>+MAINTAINER=	matthew@reztek.cz
>+COMMENT=	Fast secure hashing
> 
>-USES=		zip
>+LICENSE=	CC0-1.0
>+LICENSE_FILE=	${WRFSRC}/COPYING
> 
>-ONLY_FOR_ARCH=	amd64
>+B2VERSION=	20150529
> 
>-CFLAGS+=	-I../sse
>+USES=		zip
>+USE_CSTD=	c99
>+CFLAGS+=	-static
> WRKSRC_SUBDIR=	b2sum
> MAKEFILE=	makefile
> MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
> PLIST_FILES=	bin/b2sum
> 
>+OPTIONS_DEFINE=	OPENMP OPTIMIZED_CFLAGS SSE
>+OPTIONS_DEFAULT_amd64=SSE
>+SSE_DESC=	Use SSE2, SSSE3, SSE4.1, AVX or XOP instructions
>+
>+OPENMP_USES+=	compiler:openmp
>+OPENMP_CFLAGS+=	-fopenmp
>+
>+.include <bsd.port.options.mk>
>+
>+.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
>+CFLAGS+=	-O3
>+.if !${CFLAGS:M-march=*}
>+CFLAGS+=	-march=native
>+.endif
>+.endif
>+
>+.if (${PORT_OPTIONS:MSSE} && (${ARCH} == "i386" || ${ARCH} == "amd64"))
>+CFLAGS+=	-I../sse
>+.else
>+CFLAGS+=	-I../ref
>+EXTRA_PATCHES=	${PATCHDIR}/use_ref.patch
>+.endif
>+
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
> 
>Index: sysutils/b2sum/files/patch-blake2.h
>===================================================================
>--- sysutils/b2sum/files/patch-blake2.h	(revision 0)
>+++ sysutils/b2sum/files/patch-blake2.h	(working copy)
>@@ -0,0 +1,22 @@
>+--- ../ref/blake2.h.orig	2015-06-01 01:10:19 UTC
>++++ ../ref/blake2.h
>+@@ -19,6 +19,8 @@
>+ 
>+ #if defined(_MSC_VER)
>+ #define ALIGN(x) __declspec(align(x))
>++#elif defined(__clang__)
>++#define ALIGN(x) /* unaligned access in b2*p at -O >0 */
>+ #else
>+ #define ALIGN(x) __attribute__((aligned(x)))
>+ #endif
>+--- ../sse/blake2.h.orig	2015-05-29 08:02:54 UTC
>++++ ../sse/blake2.h
>+@@ -19,6 +19,8 @@
>+ 
>+ #if defined(_MSC_VER)
>+ #define ALIGN(x) __declspec(align(x))
>++#elif defined(__clang__)
>++#define ALIGN(x) /* unaligned access in b2*p at -O >0 */
>+ #else
>+ #define ALIGN(x) __attribute__ ((__aligned__(x)))
>+ #endif
>Index: sysutils/b2sum/files/use_ref.patch
>===================================================================
>--- sysutils/b2sum/files/use_ref.patch	(revision 0)
>+++ sysutils/b2sum/files/use_ref.patch	(working copy)
>@@ -0,0 +1,13 @@
>+--- makefile.orig	2015-05-31 23:30:20 UTC
>++++ makefile
>+@@ -1,8 +1,8 @@
>+ CC=gcc
>+ CFLAGS=-std=c99 -O3 -march=native -I../sse -static -fopenmp 
>+ LIBS=
>+-#FILES=blake2sum.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 
>++#FILES=b2sum.c ../sse/blake2b.c ../sse/blake2s.c ../sse/blake2bp.c ../sse/blake2sp.c 
>+ all: $(FILES)
>+ 	$(CC) $(FILES) $(CFLAGS) $(LIBS) -o b2sum 
>+

Actions: View | Diff

Attachments on bug 200561: 157321 | 157341