CVS commit: pkgsrc/math/nickle

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Sat Jan 13 04:25:39 UTC 2024

Modified Files:
        pkgsrc/math/nickle: Makefile distinfo
Added Files:
        pkgsrc/math/nickle/patches: patch-test_Makefile.am

Log Message:
math/nickle: Fix cross-build, again.

This was fixed last year, and the fix was upstreamed, and the fix was
removed when we updated, and then upstream broke it again, so now we
have to fix it again.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/math/nickle/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/math/nickle/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/math/nickle/patches/patch-test_Makefile.am

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/nickle/Makefile
diff -u pkgsrc/math/nickle/Makefile:1.31 pkgsrc/math/nickle/Makefile:1.32
--- pkgsrc/math/nickle/Makefile:1.31    Mon Dec 11 10:11:04 2023
+++ pkgsrc/math/nickle/Makefile Sat Jan 13 04:25:39 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2023/12/11 10:11:04 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2024/01/13 04:25:39 riastradh Exp $
 
 DISTNAME=      nickle-2.96
 CATEGORIES=    math lang
@@ -9,9 +9,17 @@ HOMEPAGE=      https://nickle.org/
 COMMENT=       Desk calculator language
 LICENSE=       mit
 
+USE_TOOLS+=    autoconf automake autoreconf
+TOOL_DEPENDS+= autoconf-archive>=0:../../devel/autoconf-archive
+
+pre-configure:
+       @${STEP_MSG} Autoreconf for Makefile.am patch
+       ${RUN} cd ${WRKSRC} && autoreconf -fi
+
 GNU_CONFIGURE= yes
 
-CONFIGURE_ARGS+=       --with-readline=${BUILDLINK_PREFIX.readline}
+CONFIGURE_ARGS+=       --with-readline=${BUILDLINK_PREFIX.editlinereadline}
+CONFIGURE_ARGS+=       CC_FOR_BUILD=${NATIVE_CC:Q:U${CC:Q}}
 
 # suppress detection of DOCBOOK
 CONFIGURE_ENV+=        ac_cv_path_DOCBOOK2PDF=

Index: pkgsrc/math/nickle/distinfo
diff -u pkgsrc/math/nickle/distinfo:1.26 pkgsrc/math/nickle/distinfo:1.27
--- pkgsrc/math/nickle/distinfo:1.26    Mon Dec 11 10:11:04 2023
+++ pkgsrc/math/nickle/distinfo Sat Jan 13 04:25:39 2024
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.26 2023/12/11 10:11:04 wiz Exp $
+$NetBSD: distinfo,v 1.27 2024/01/13 04:25:39 riastradh Exp $
 
 BLAKE2s (nickle-2.96.tar.gz) = 2d2e9c761307bbeec656f70ccb75696cc3d9b07375f7c2df1ec8d0d818b710b8
 SHA512 (nickle-2.96.tar.gz) = 4d06eb2e62a7c6c322ff9b406cfff2f2e68d0ff0eb3c84240aced618b89aa2a6be8822d7ae4169dc3e42c94527fb587a6c5fd9739bde03098de9f86b2bf11e3a
 Size (nickle-2.96.tar.gz) = 2552972 bytes
+SHA1 (patch-test_Makefile.am) = 7238760ee390f7b1d07f267beb1b222f2af9068e

Added files:

Index: pkgsrc/math/nickle/patches/patch-test_Makefile.am
diff -u /dev/null pkgsrc/math/nickle/patches/patch-test_Makefile.am:1.3
--- /dev/null   Sat Jan 13 04:25:39 2024
+++ pkgsrc/math/nickle/patches/patch-test_Makefile.am   Sat Jan 13 04:25:39 2024
@@ -0,0 +1,25 @@
+$NetBSD: patch-test_Makefile.am,v 1.3 2024/01/13 04:25:39 riastradh Exp $
+
+Fix cross-build again.  noinst_PROGRAMS does not work for programs that
+are executed at build-time.  Maybe some day automake will sprout a
+built-in way to do the right thing here, but so far it hasn't, to my
+knowledge.
+
+--- test/Makefile.am.orig      2023-12-02 21:10:00.000000000 +0000
++++ test/Makefile.am
+@@ -38,11 +38,10 @@ EXTRA_DIST=$(check_SCRIPTS) math-tables.
+ 
+ math.5c: $(TABLES)
+ 
+-noinst_PROGRAMS = math-tables
+-
+-math_tables_SOURCES = math-tables.c
+-
+-math_tables_LIBS = -lm
++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
+ 
+ $(TABLES): math-tables$(BUILD_EXEEXT)
+       ./math-tables$(BUILD_EXEEXT) > $(TABLES)