Sat Jun 17 11:25:19 2023 UTC ()
math/nickle: Make this cross-compile.

While here, because for CC_FOR_BUILD it was easiest to just edit
configure.ac and autoreconf anyway, move a configure patch to a
configure.ac patch for some readline symbol detection.

No change to generated file math-tables.5c (which is used only for
testing anyway) in native vs cross compilation.  `bmake test' passes
in native compilation.


(riastradh)
diff -r1.25 -r1.26 pkgsrc/math/nickle/Makefile
diff -r1.20 -r1.21 pkgsrc/math/nickle/distinfo
diff -r1.1 -r0 pkgsrc/math/nickle/patches/patch-configure
diff -r0 -r1.1 pkgsrc/math/nickle/patches/patch-configure.ac
diff -r0 -r1.1 pkgsrc/math/nickle/patches/patch-test_Makefile.am
cvs diff -r1.25 -r1.26 pkgsrc/math/nickle/Makefile (expand / switch to unified diff)

--- pkgsrc/math/nickle/Makefile 2023/04/20 11:12:15 1.25
+++ pkgsrc/math/nickle/Makefile 2023/06/17 11:25:19 1.26
@@ -1,20 +1,28 @@ @@ -1,20 +1,28 @@
1# $NetBSD: Makefile,v 1.25 2023/04/20 11:12:15 tnn Exp $ 1# $NetBSD: Makefile,v 1.26 2023/06/17 11:25:19 riastradh Exp $
2 2
3DISTNAME= nickle-2.91 3DISTNAME= nickle-2.91
4CATEGORIES= math lang 4CATEGORIES= math lang
5MASTER_SITES= http://nickle.org/release/ 5MASTER_SITES= http://nickle.org/release/
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= https://nickle.org/ 8HOMEPAGE= https://nickle.org/
9COMMENT= Desk calculator language 9COMMENT= Desk calculator language
10LICENSE= mit 10LICENSE= mit
11 11
 12USE_TOOLS+= autoconf automake autoreconf
 13TOOL_DEPENDS+= autoconf-archive>=0:../../devel/autoconf-archive
 14
12GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
13 16
14# suppress detection of DOCBOOK 17# suppress detection of DOCBOOK
15CONFIGURE_ENV+= ac_cv_path_DOCBOOK2PDF= 18CONFIGURE_ENV+= ac_cv_path_DOCBOOK2PDF=
16 19
 20CONFIGURE_ARGS+=CC_FOR_BUILD=${NATIVE_CC:Q}
 21
17TEST_TARGET= check 22TEST_TARGET= check
18 23
 24pre-configure:
 25 ${RUN} cd ${WRKSRC} && autoreconf -fi
 26
19.include "../../mk/readline.buildlink3.mk" 27.include "../../mk/readline.buildlink3.mk"
20.include "../../mk/bsd.pkg.mk" 28.include "../../mk/bsd.pkg.mk"
cvs diff -r1.20 -r1.21 pkgsrc/math/nickle/distinfo (expand / switch to unified diff)

--- pkgsrc/math/nickle/distinfo 2023/04/20 11:10:26 1.20
+++ pkgsrc/math/nickle/distinfo 2023/06/17 11:25:19 1.21
@@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
1$NetBSD: distinfo,v 1.20 2023/04/20 11:10:26 tnn Exp $ 1$NetBSD: distinfo,v 1.21 2023/06/17 11:25:19 riastradh Exp $
2 2
3BLAKE2s (nickle-2.91.tar.gz) = 0c68e83c11f48e370c413811804d20dd331ae08b003d65fd26ebded8b1a9d38f 3BLAKE2s (nickle-2.91.tar.gz) = 0c68e83c11f48e370c413811804d20dd331ae08b003d65fd26ebded8b1a9d38f
4SHA512 (nickle-2.91.tar.gz) = 4741cdfad83c84da2c232b965cef52deb7c04f04db9ba1255d420ecd51ba63f9ad249e2e7b5ee4e0be855fdf611d5f5311f2c3cd6631f1211ce65d1e78b0d60f 4SHA512 (nickle-2.91.tar.gz) = 4741cdfad83c84da2c232b965cef52deb7c04f04db9ba1255d420ecd51ba63f9ad249e2e7b5ee4e0be855fdf611d5f5311f2c3cd6631f1211ce65d1e78b0d60f
5Size (nickle-2.91.tar.gz) = 2505408 bytes 5Size (nickle-2.91.tar.gz) = 2505408 bytes
6SHA1 (patch-aa) = 4cbb563244883f6c9f7a3594875052f8d9a9e9b3 6SHA1 (patch-aa) = 4cbb563244883f6c9f7a3594875052f8d9a9e9b3
7SHA1 (patch-builtin-date.c) = 1aa792b5a91f4b808208e73ee38bd539ab0c12fb 7SHA1 (patch-builtin-date.c) = 1aa792b5a91f4b808208e73ee38bd539ab0c12fb
8SHA1 (patch-configure) = fbbe0e41f4b9b3617eeb77879623bcdd48864af2 8SHA1 (patch-configure.ac) = 72bf3392df432bc8cdbd36760aad254acf6fe699
9SHA1 (patch-float.c) = f157fc605b617e7b5bdaa192d48e679b596a9228 9SHA1 (patch-float.c) = f157fc605b617e7b5bdaa192d48e679b596a9228
10SHA1 (patch-lex.c) = f9d5f3f282f97a94195730062525e9f6310bb316 10SHA1 (patch-lex.c) = f9d5f3f282f97a94195730062525e9f6310bb316
11SHA1 (patch-main.c) = 3f6d009255cdf51d6e5dcfb8ae3c0d49f6991694 11SHA1 (patch-main.c) = 3f6d009255cdf51d6e5dcfb8ae3c0d49f6991694
 12SHA1 (patch-test_Makefile.am) = 17e54a0e2172b0fb65a3d8a8eb615d7cfab5efee
File Deleted: pkgsrc/math/nickle/patches/Attic/patch-configure
File Added: pkgsrc/math/nickle/patches/Attic/patch-configure.ac
$NetBSD: patch-configure.ac,v 1.1 2023/06/17 11:25:19 riastradh Exp $

Get native compiler for executable compiled and run at build-time.

Add missing configure check for rl_echo_signal_char.

--- configure.ac.orig	2023-04-18 19:55:55.000000000 +0000
+++ configure.ac
@@ -17,6 +17,7 @@ AM_INIT_AUTOMAKE([foreign])
 AC_SUBST([RELEASE_DATE])
 dnl Checks for programs.
 AC_PROG_CC
+AX_PROG_CC_FOR_BUILD
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AM_PROG_LEX
@@ -117,6 +118,8 @@ if test "x$ac_cv_header_readline_readlin
 		  AC_DEFINE(HAVE_RL_RESET_AFTER_SIGNAL,1,[Has rl_reset_after_signal]),,[#include <readline/readline.h>])
     AC_CHECK_DECL(rl_cleanup_after_signal,
 		  AC_DEFINE(HAVE_RL_CLEANUP_AFTER_SIGNAL,1,[Has rl_cleanup_after_signal]),,[#include <readline/readline.h>])
+    AC_CHECK_DECL(rl_echo_signal_char,
+		  AC_DEFINE(HAVE_RL_ECHO_SIGNAL_CHAR,1,[Has rl_echo_signal_char]),,[#include <readline/readline.h>])
 fi
 
 if test "x$prefix" = xNONE; then
File Added: pkgsrc/math/nickle/patches/Attic/patch-test_Makefile.am
$NetBSD: patch-test_Makefile.am,v 1.1 2023/06/17 11:25:19 riastradh Exp $

Use native compiler for executable compiled and run at build-time.

--- test/Makefile.am.orig	2023-04-18 19:55:55.000000000 +0000
+++ test/Makefile.am
@@ -27,7 +27,10 @@ testdir=$(pkgdatadir)/test
 
 test_DATA=$(check_SCRIPTS) $(TABLES)
 
-noinst_PROGRAMS=math-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
 
 CLEANFILES=$(TABLES)
 
@@ -39,5 +42,5 @@ EXTRA_DIST=$(check_SCRIPTS)
 
 math.5c: $(TABLES)
 
-$(TABLES): math-tables
-	./math-tables > $(TABLES)
+$(TABLES): math-tables$(BUILD_EXEEXT)
+	./math-tables$(BUILD_EXEEXT) > $(TABLES)