CVS commit: pkgsrc/security/argon2

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Mon May 27 01:17:21 UTC 2019

Modified Files:
        pkgsrc/security/argon2: distinfo
        pkgsrc/security/argon2/patches: patch-Makefile

Log Message:
argon2: don't test if opt.c can build with -march=native.

Avoid a situation where a build host can use SSE2, but opt.c is then
compiled without SSE2 support (which fails).

Also check for CFLAGS for this compile test while here.

amend comment: we avoid -march=native not because of netbsd, but because
it results in shiny package builders creating packages not usable by
some users with older machines.

PR pkg/54238: security/argon2 build fails on i386-current (8.99.41)


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/argon2/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/argon2/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/security/argon2/distinfo
diff -u pkgsrc/security/argon2/distinfo:1.4 pkgsrc/security/argon2/distinfo:1.5
--- pkgsrc/security/argon2/distinfo:1.4 Wed Jan 10 09:36:54 2018
+++ pkgsrc/security/argon2/distinfo     Mon May 27 01:17:21 2019
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2018/01/10 09:36:54 adam Exp $
+$NetBSD: distinfo,v 1.5 2019/05/27 01:17:21 maya Exp $
 
 SHA1 (phc-winner-argon2-20171227.tar.gz) = c398df55c8fffe70c9a952dd3f696115437234d8
 RMD160 (phc-winner-argon2-20171227.tar.gz) = e4cf2482f11724f580da0051a8c982f9237d3451
 SHA512 (phc-winner-argon2-20171227.tar.gz) = 9c9e1a3905e61ac6913d1e073c104477e419ddd0506adc4487e88e98d19165ed8901fe8bb11246ed0cc71b3523c190da9692d5926642f86be09c3e67510afe4d
 Size (phc-winner-argon2-20171227.tar.gz) = 1503745 bytes
-SHA1 (patch-Makefile) = d075b01a8452d7d7beac22b72521662ad8527b10
+SHA1 (patch-Makefile) = d3efbe77767a174cbc27d6e9b255e774afbebb2b

Index: pkgsrc/security/argon2/patches/patch-Makefile
diff -u pkgsrc/security/argon2/patches/patch-Makefile:1.4 pkgsrc/security/argon2/patches/patch-Makefile:1.5
--- pkgsrc/security/argon2/patches/patch-Makefile:1.4   Wed Jan 10 09:36:54 2018
+++ pkgsrc/security/argon2/patches/patch-Makefile       Mon May 27 01:17:21 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makefile,v 1.4 2018/01/10 09:36:54 adam Exp $
+$NetBSD: patch-Makefile,v 1.5 2019/05/27 01:17:21 maya Exp $
 
 Remove -O3 -g compiler flags.
 Disable -march=native since it causes problems on NetBSD.
@@ -15,7 +15,17 @@ Use the same shared library name across 
  
  ifeq ($(NO_THREADS), 1)
  CFLAGS += -DARGON2_NO_THREADS
-@@ -50,7 +50,6 @@ $(info Building without optimizations)
+@@ -41,8 +41,7 @@ endif
+ CI_CFLAGS := $(CFLAGS) -Werror=declaration-after-statement -D_FORTIFY_SOURCE=2 \
+                               -Wextra -Wno-type-limits -Werror -coverage -DTEST_LARGE_RAM
+ 
+-OPTTARGET ?= native
+-OPTTEST := $(shell $(CC) -Iinclude -Isrc -march=$(OPTTARGET) src/opt.c -c \
++OPTTEST := $(shell $(CC) $(CFLAGS) -Iinclude -Isrc src/opt.c -c \
+                       -o /dev/null 2>/dev/null; echo $$?)
+ # Detect compatible platform
+ ifneq ($(OPTTEST), 0)
+@@ -50,7 +49,6 @@ $(info Building without optimizations)
        SRC += src/ref.c
  else
  $(info Building with optimizations for $(OPTTARGET))
@@ -23,7 +33,7 @@ Use the same shared library name across 
        SRC += src/opt.c
  endif
  
-@@ -59,7 +58,7 @@ KERNEL_NAME := $(shell uname -s)
+@@ -59,7 +57,7 @@ KERNEL_NAME := $(shell uname -s)
  
  LIB_NAME=argon2
  ifeq ($(KERNEL_NAME), Linux)
@@ -32,7 +42,7 @@ Use the same shared library name across 
        LIB_CFLAGS := -shared -fPIC -fvisibility=hidden -DA2_VISCTL=1
        SO_LDFLAGS := -Wl,-soname,lib$(LIB_NAME).$(LIB_EXT)
        LINKED_LIB_EXT := so
-@@ -69,8 +68,8 @@ ifeq ($(KERNEL_NAME), $(filter $(KERNEL_
+@@ -69,8 +67,8 @@ ifeq ($(KERNEL_NAME), $(filter $(KERNEL_
        LIB_CFLAGS := -shared -fPIC
  endif
  ifeq ($(KERNEL_NAME), Darwin)