v25.2

Makefile.am

@@ -1,31 +1,35 @@
 
-if WANT_JANSSON
-JANSSON_INCLUDES= -I$(top_srcdir)/compat/jansson
+if HAVE_APPLE
+# MacOS uses Homebrew to install needed packages but they aren't linked for
+# the jansson test in configure. Ignore the failed test & link them now,
+# different path for different CPU arch.
+
+if ARCH_ARM64
+  EXTRA_INCLUDES = -I/opt/homebrew/include
+  EXTRA_LIBS     = -L/opt/homebrew/lib
 else
-JANSSON_INCLUDES=
+  EXTRA_INCLUDES = -I/usr/local/include
+  EXTRA_LIBS     = -L/usr/local/lib
 endif
 
-# Hook for for GMP on MacOS which is provided by homebrew.
-# Homebrew has different linkage on x86_64 & ARM64.
-# Need complex expressions, nesting or elseif, none seem to work.
-if !HAVE_APPLE
-  GMP_INCLUDES =
-  GMP_LIB = -lgmp
-endif
-if ARM64_APPLE
-  GMP_INCLUDES = -I/opt/homebrew/include
-  GMP_LIB = /opt/homebrew/lib/libgmp.a
+else
+
+if WANT_JANSSON
+# Can't find jansson libraries, compile the included source code.
+  EXTRA_INCLUDES = -I$(top_srcdir)/compat/jansson
+  EXTRA_LIBS     = -L$(top_srcdir)/compat/jansson
+else
+  EXTRA_INCLUDES =
+  EXTRA_LIBS     =
 endif
-if X86_64_APPLE
-  GMP_INCLUDES = -I/usr/local/include
-  GMP_LIB = /usr/local/lib/libgmp.a
+
 endif
 
 EXTRA_DIST = example-cfg.json nomacro.pl
 
 SUBDIRS = compat
 
-ALL_INCLUDES = @PTHREAD_FLAGS@ -fno-strict-aliasing $(JANSSON_INCLUDES) $(GMP_INCLUDES) -I.
+ALL_INCLUDES = @PTHREAD_FLAGS@ -fno-strict-aliasing $(EXTRA_INCLUDES) -I.
 
 bin_PROGRAMS = cpuminer
 
@@ -288,21 +292,20 @@ cpuminer_SOURCES = \
   algo/yespower/yespower-opt.c \
   algo/yespower/yespower-ref.c \
   algo/yespower/yespower-blake2b-ref.c
-
-disable_flags =
+
+if HAVE_WINDOWS
+   cpuminer_SOURCES += compat/winansi.c
+endif
 
 if USE_ASM
+   disable_flags =
    cpuminer_SOURCES += asm/neoscrypt_asm.S
 else
    disable_flags += -DNOASM
 endif
 
-if HAVE_WINDOWS
-   cpuminer_SOURCES += compat/winansi.c
-endif
-
 cpuminer_LDFLAGS = @LDFLAGS@
-cpuminer_LDADD	= @LIBCURL@ @JANSSON_LIBS@ @PTHREAD_LIBS@ @WS2_LIBS@ $(GMP_LIB)
+cpuminer_LDADD	= $(EXTRA_LIBS) @LIBCURL@ -ljansson @PTHREAD_LIBS@ @WS2_LIBS@ -lgmp
 cpuminer_CPPFLAGS = @LIBCURL_CPPFLAGS@ $(ALL_INCLUDES)
 cpuminer_CFLAGS = -Wno-pointer-sign -Wno-pointer-to-int-cast $(disable_flags)
 
@@ -312,9 +315,6 @@ endif
 
 if HAVE_WINDOWS
 
-# Add -U_WIN32_WINNT to command line CFLAGS to undefine
-cpuminer_CFLAGS += -D_WIN32_WINNT=0x0601
-
 # use to profile an object
 # gprof_cflags = -pg -g3
 # cpuminer_LDFLAGS += -pg

README.md

@@ -36,34 +36,18 @@ for compile instructions.
 Requirements
 ------------
 
-1. A x86_64 architecture CPU with a minimum of SSE2 support. This includes
-Intel Core2 and newer and AMD equivalents. Further optimizations are available
-on some algoritms for CPUs with AES, AVX, AVX2, SHA, AVX512 and VAES.
-
-32 bit CPUs are not supported.
-Other CPU architectures such as ARM, Raspberry Pi, RISC-V, Xeon Phi, etc,
-are not supported.
+1. A 64 bit CPU supporting x86_64 (Intel or AMD) or aarch64 (ARM).
+x86_64 requires SSE2, aarch64 requires armv8 & NEON.
 
 Mobile CPUs like laptop computers are not recommended because they aren't
 designed for extreme heat of operating at full load for extended periods of
 time.
 
-Older CPUs and ARM architecture may be supported by cpuminer-multi by TPruvot.
-
-2. 64 bit Linux or Windows OS. Ubuntu and Fedora based distributions,
-including Mint and Centos, are known to work and have all dependencies
-in their repositories. Others may work but may require more effort. Older
-versions such as Centos 6 don't work due to missing features. 
-
-Windows 7 or newer is supported with mingw_w64 and msys or using the pre-built
-binaries. WindowsXP 64 bit is YMMV.
-
-FreeBSD is not actively tested but should work, YMMV.
-MacOS, OSx and Android are not supported.
+2. 64 bit operating system including Linux, Windows, MacOS, or BSD.
+Android, IOS and alt OSs like Haiku & ReactOS are not supported.
 
 3. Stratum pool supporting stratum+tcp:// or stratum+ssl:// protocols or
-RPC getwork using http:// or https://.
-GBT is YMMV.
+RPC getblockte,plate using http:// or https://.
 
 Supported Algorithms
 --------------------

RELEASE_NOTES

@@ -75,6 +75,14 @@ If not what makes it happen or not happen?
 Change Log
 ----------
 
+v25.2
+
+ARM: Fixed regression from v25.1 that could cause build fail.
+BSD: FreeBSD is now supported. Other BSDs may also work.
+MacOS: build with installed jansson library instead of compiling the included source code.
+Windows: remove "_WIN32_WINNT=0x0601" which is a downgrade on Win11.
+Changed build.sh shell from bash to sh.
+
 v25.1
 
 MacOS ARM64: m7m algo is now working.

build.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 make distclean || echo clean
 rm -f config.status

clean-all.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #
 # make clean and rm all the targetted executables.
 

compat.h

@@ -3,7 +3,7 @@
 
 #ifdef WIN32
 
-#if _WIN32_WINNT==0x0601    // Windows 7
+#if _WIN32_WINNT>=0x0601    // Windows 7
  #define WINDOWS_CPU_GROUPS_ENABLED 1
 #endif