$NetBSD: patch-Makefile,v 1.6 2019/08/07 12:58:49 nia Exp $ Remove -O3 -g compiler flags. Disable -march=native since it causes problems on NetBSD. Use the same shared library name across platforms. --- Makefile.orig 2019-05-20 09:18:00.000000000 +0000 +++ Makefile @@ -37,7 +37,7 @@ SRC_BENCH = src/bench.c SRC_GENKAT = src/genkat.c OBJ = $(SRC:.c=.o) -CFLAGS += -std=c89 -O3 -Wall -g -Iinclude -Isrc +CFLAGS += -std=c89 -Wall -Iinclude -Isrc ifeq ($(NO_THREADS), 1) CFLAGS += -DARGON2_NO_THREADS @@ -48,8 +48,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) @@ -57,7 +56,6 @@ $(info Building without optimizations) SRC += src/ref.c else $(info Building with optimizations for $(OPTTARGET)) - CFLAGS += -march=$(OPTTARGET) SRC += src/opt.c endif @@ -70,7 +68,7 @@ PC_NAME = lib$(LIB_NAME).pc PC_SRC = $(PC_NAME).in ifeq ($(KERNEL_NAME), Linux) - LIB_EXT := so.$(ABI_VERSION) + LIB_EXT := so LIB_CFLAGS := -shared -fPIC -fvisibility=hidden -DA2_VISCTL=1 SO_LDFLAGS := -Wl,-soname,lib$(LIB_NAME).$(LIB_EXT) LINKED_LIB_EXT := so @@ -82,8 +80,8 @@ ifeq ($(KERNEL_NAME), $(filter $(KERNEL_ PC_EXTRA_LIBS ?= endif ifeq ($(KERNEL_NAME), Darwin) - LIB_EXT := $(ABI_VERSION).dylib - LIB_CFLAGS := -dynamiclib -install_name @rpath/lib$(LIB_NAME).$(LIB_EXT) + LIB_EXT := dylib + LIB_CFLAGS := -dynamiclib -install_name ${DESTDIR}${PREFIX}/lib/lib$(LIB_NAME).$(LIB_EXT) LINKED_LIB_EXT := dylib PC_EXTRA_LIBS ?= endif @@ -103,7 +101,6 @@ ifeq ($(findstring MSYS, $(KERNEL_NAME)) PC_EXTRA_LIBS ?= endif ifeq ($(KERNEL_NAME), SunOS) - CC := gcc CFLAGS += -D_REENTRANT LIB_EXT := so LIB_CFLAGS := -shared -fPIC