$NetBSD: patch-src_Makefile,v 1.2 2022/09/05 11:13:56 adam Exp $ Set preferences. Don't override CC nor optimisation flags in CFLAGS. Remove sed magic; we'll use nbsed. --- src/Makefile.orig 2022-09-02 14:58:13.000000000 +0000 +++ src/Makefile @@ -59,8 +59,6 @@ MODULE_INTERFACE_VERSION := 700 ## Native compiler paths ## -CC := gcc -CXX := g++ AR := ar FIND := find INSTALL := install @@ -69,14 +67,8 @@ SED := sed SED_IN_PLACE := -i ifeq ($(UNAME),Darwin) -CC := clang -CXX := clang++ -# the sed -i option of macOS requires a parameter for the backup file (we just use "") -AR := /usr/bin/ar -SED := /usr/bin/sed -SED_IN_PLACE := -i "" DARWIN_VERSION := $(shell uname -r | cut -d. -f1) -IS_APPLE_SILICON := $(shell lipo /bin/zsh -verify_arch arm64e && echo 1 || echo 0) +IS_APPLE_SILICON := 0 endif ifneq (,$(filter $(UNAME),FreeBSD NetBSD)) @@ -233,7 +225,6 @@ endif endif ifeq ($(DEBUG),0) -CFLAGS += -O2 ifneq ($(UNAME),Darwin) LFLAGS += -s endif @@ -328,6 +319,7 @@ endif # FreeBSD ifeq ($(UNAME),NetBSD) CFLAGS_NATIVE := $(CFLAGS) LFLAGS_NATIVE := $(LFLAGS) +LFLAGS_NATIVE += -lm LFLAGS_NATIVE += -lpthread endif # NetBSD @@ -684,8 +676,13 @@ endif $(MODULES_DISABLE): ; ifeq ($(SHARED),1) + ifeq ($(UNAME),Darwin) +modules/module_%.$(MODULE_SUFFIX): src/modules/module_%.c $(HASHCAT_LIBRARY) + $(CC) $(CCFLAGS) $(CFLAGS_NATIVE) $^ -o $@ $(LFLAGS_NATIVE) -install_name $(SHARED_FOLDER)/$@ -shared -fPIC -D MODULE_INTERFACE_VERSION_CURRENT=$(MODULE_INTERFACE_VERSION) + else modules/module_%.$(MODULE_SUFFIX): src/modules/module_%.c $(HASHCAT_LIBRARY) $(CC) $(CCFLAGS) $(CFLAGS_NATIVE) $^ -o $@ $(LFLAGS_NATIVE) -shared -fPIC -D MODULE_INTERFACE_VERSION_CURRENT=$(MODULE_INTERFACE_VERSION) + endif else modules/module_%.$(MODULE_SUFFIX): src/modules/module_%.c obj/combined.NATIVE.a $(CC) $(CCFLAGS) $(CFLAGS_NATIVE) $^ -o $@ $(LFLAGS_NATIVE) -shared -fPIC -D MODULE_INTERFACE_VERSION_CURRENT=$(MODULE_INTERFACE_VERSION)