From keithp at keithp.com  Sat Jan 13 17:51:45 2024
From: keithp at keithp.com (Keith Packard)
Date: Sat, 13 Jan 2024 17:51:45 -0800 (PST)
Subject: [Nickle] nickle: Changes to 'refs/tags/2.97'
Message-ID: <20240114015145.A171A3F207BA@elaine.keithp.com>

Tag '2.97' created by Keith Packard <keithp at keithp.com> at 2024-01-14 01:51 -0800

Version 2.97
-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEw4O3eCVWE9/bQJ2R2yIaaQAAABEFAmWjPh4ACgkQ2yIaaQAA
ABH9oA/+MPH1S/oUmmT+8iDOegXjYErEqPvAzto8R3vdQynkEJ1XHfLcj6JmXtHl
XHVA+A2J9lOMaTzCzzrlACur//6kji+id1NE5L1cJZiK+VEW6Fp3sJs7lW+B1Xev
43UzsW+GNpTQ1NodPrmnlfcjkYXkGH/RrXOw3UbRoEodtM5kHEpUC3a0O3MMYA/a
hNkyc/5YkNnsVvjr1cHPEgxTzEnmoaR32tjqYRt91waHEsxZoflKqy/Kytdr0tmv
a7v/Qj4V9mhaa5BWjc2Yr7kFzog+sWAXkYvJ7e4ufr3S2yIr3IkBgVYPs8uCCK4F
6DvYzVVHuDyDKjRiK3mqP+Dfsts7BpzXdW2wk0Kq6jz2kNjnD0NIRh36nLPIy6R+
ukLEnz9GDpttJqlc0tTEXptKALYxebN3Wj6FZK7fnrJqUPSBeRs4F9a+IvFB4ra4
F31nXLYyV0gSkF5U4zLVUmn1PA68vgtxfvudQ+0S+yH5lbnGSdFiWsNG89hjKYF2
zwiwchwg0MaBwnf5AMhj4/ZIEs+ajvWrl1GfWsmBN5iISOerC2ku4DRHRE4O9a3X
XBW9wBZ4W10odkJH11O/hBQEqV8/jfC4+s+KYAIzdIm9V/Hmjxh6aJBsHUaXl01V
T7pH4VzYYu0eaa4YRgUsV38CE1lZQYi5kqNLGInmA7pLP56wJcE=
=yXbS
-----END PGP SIGNATURE-----

Changes since 2.96-5:
---
 0 files changed
---

From keithp at keithp.com  Sat Jan 13 17:51:45 2024
From: keithp at keithp.com (Keith Packard)
Date: Sat, 13 Jan 2024 17:51:45 -0800 (PST)
Subject: [Nickle] nickle: Branch 'master' - 5 commits
Message-ID: <20240114015145.83F823F20DAA@elaine.keithp.com>

 bench/Makefile.am |   10 +++++-----
 bench/runbench.sh |    2 +-
 configure.ac      |    4 ++--
 debian/changelog  |    8 ++++++++
 debian/rules      |    3 +++
 test/Makefile.am  |   14 +++++++-------
 6 files changed, 26 insertions(+), 15 deletions(-)

New commits:
commit 1a6f092786d33a84d91503b44aaf6528c9a23bf8
Author: Keith Packard <keithp at keithp.com>
Date:   Sat Jan 13 17:34:09 2024 -0800

    Version 2.97
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.ac b/configure.ac
index 4430864..9e727ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,8 +6,8 @@ dnl for licensing information.
 
 AC_PREREQ([2.69])
 
-AC_INIT([nickle],[2.96],[http://nickle.org],[nickle])
-RELEASE_DATE="2023-12-02"
+AC_INIT([nickle],[2.97],[http://nickle.org],[nickle])
+RELEASE_DATE="2024-01-13"
 AC_CONFIG_SRCDIR([nickle.h])
 AC_CONFIG_HEADERS([nickle-config.h])
 AC_CONFIG_AUX_DIR(.)
diff --git a/debian/changelog b/debian/changelog
index 1b5ae50..5523868 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nickle (2.97) unstable; urgency=medium
+
+  * Install benchmark bits
+  * Make sure cross compilation works for NetBSD users.
+  * Clean up some lintian warnings about bench files
+
+ -- Keith Packard <keithp at keithp.com>  Sat, 13 Jan 2024 17:47:03 -0800
+
 nickle (2.96) unstable; urgency=medium
 
   * Fix LDFLAGS in debian package.
commit 45bc1d800432eeba1bbdf8c14f6a32655b861bd7
Author: Keith Packard <keithp at keithp.com>
Date:   Sat Jan 13 17:46:04 2024 -0800

    test: Clean up manually-built math-tables bits
    
    Make sure we locate math-tables.c using $(srcdir). Add
    math-tables and math-tables.o to the clean rule.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/test/Makefile.am b/test/Makefile.am
index a769239..f7ab8ae 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -28,8 +28,6 @@ testdir=$(pkgdatadir)/test
 
 test_DATA=$(check_SCRIPTS) $(TABLES)
 
-CLEANFILES=$(TABLES)
-
 TESTS_ENVIRONMENT=NICKLESTART=$(top_srcdir)/builtin.5c NICKLEPATH=$(top_srcdir) MALLOC_CHECK_=3 MALLOC_PERTURB_=$(shell echo $$(($$RANDOM % 255 + 1)))
 TESTS=$(check_SCRIPTS)
 LOG_COMPILER=$(top_builddir)/nickle
@@ -44,5 +42,7 @@ $(TABLES): math-tables$(BUILD_EXEEXT)
 math-tables$(BUILD_EXEEXT): math-tables.o
 	$(CC_FOR_BUILD) -o $@ $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) math-tables.o -lm
 
-math-tables.o: math-tables.c
-	$(CC_FOR_BUILD) -o $@ $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) -c math-tables.c
+math-tables.o: $(srcdir)/math-tables.c
+	$(CC_FOR_BUILD) -o $@ $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) -c $(srcdir)/math-tables.c
+
+CLEANFILES=$(TABLES) math-tables$(BUILD_EXEEXT) math-tables.o
commit f78f4a57cfdb76084b888c569e663a2b3a454c29
Author: Keith Packard <keithp at keithp.com>
Date:   Sat Jan 13 17:32:35 2024 -0800

    bench: Install runbench.sh script with +x mode
    
    Use bench_SCRIPTS to ensure it gets installed with the correct mode.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/bench/Makefile.am b/bench/Makefile.am
index f1de097..c95a61d 100644
--- a/bench/Makefile.am
+++ b/bench/Makefile.am
@@ -12,12 +12,12 @@ NICKLEFILES = choose.5c \
 	rfact.5c
 HARNESS=runbench.sh
 
-EXTRA_DIST=$(CFILES) $(BCFILES) $(NICKLEFILES) $(HARNESS)
-
 CLEANFILES=choose composite ifact rfact
 
-# Install bench files so they can be run later
-
 benchdir=$(pkgdatadir)/bench
 
-bench_DATA=$(EXTRA_DIST)
+bench_DATA=$(CFILES) $(BCFILES) $(NICKLEFILES)
+
+bench_SCRIPTS=$(HARNESS)
+
+EXTRA_DIST=$(bench_DATA) $(bench_SCRIPTS)
diff --git a/bench/runbench.sh b/bench/runbench.sh
index 8b37a05..ce8c81c 100644
--- a/bench/runbench.sh
+++ b/bench/runbench.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 while read bmname
 do
   gcc -O4 -o "$bmname" "$bmname.c" -lgmp > /dev/null 2>&1 || exit 1
commit 559e5ad319202e7edd4450fb5dcd4c4314244665
Author: Keith Packard <keithp at keithp.com>
Date:   Sat Jan 13 17:31:43 2024 -0800

    debian: Add hardening rules to *FLAGS_FOR_BUILD
    
    This ensures we use the same compiler flags when building the
    math-tables generator.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/debian/rules b/debian/rules
index a453e87..bfd6afb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,9 @@ export DH_VERBOSE=1
 %:
 	dh $@
 
+override_dh_auto_configure:
+	CFLAGS_FOR_BUILD="$(CFLAGS)" LDFLAGS_FOR_BUILD="$(LDFLAGS)" dh_auto_configure
+
 # Don't install duplicate copyright info from COPYING files
 # Make examples which happen to start with #! executable
 
commit b35b5ff3414d688898b74eea11e02f9da2f5d4f0
Author: Keith Packard <keithp at keithp.com>
Date:   Sat Jan 13 17:06:00 2024 -0800

    Revert "test: Fix how math-tables is built"
    
    noinst_PROGRAMS doesn't work for cross compilation
    
    This reverts commit b679990bf025b98f1db2f097d1ba12129116f152.

diff --git a/test/Makefile.am b/test/Makefile.am
index a912334..a769239 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -38,11 +38,11 @@ EXTRA_DIST=$(check_SCRIPTS) math-tables.c
 
 math.5c: $(TABLES)
 
-noinst_PROGRAMS = math-tables
-
-math_tables_SOURCES = math-tables.c
-
-math_tables_LIBS = -lm
-
 $(TABLES): math-tables$(BUILD_EXEEXT)
 	./math-tables$(BUILD_EXEEXT) > $(TABLES)
+
+math-tables$(BUILD_EXEEXT): math-tables.o
+	$(CC_FOR_BUILD) -o $@ $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) math-tables.o -lm
+
+math-tables.o: math-tables.c
+	$(CC_FOR_BUILD) -o $@ $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) -c math-tables.c