CVS commit: pkgsrc/shells/bash

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Jul 10 14:36:20 UTC 2025

Modified Files:
        pkgsrc/shells/bash: Makefile distinfo
Added Files:
        pkgsrc/shells/bash/patches: patch-examples_loadables_finfo.c

Log Message:
bash: Fix illumos GCC 14 build.

While here add "loadables" to BUILD_TARGET so that they are all built during
the build phase instead of the install phase.


To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 pkgsrc/shells/bash/Makefile
cvs rdiff -u -r1.86 -r1.87 pkgsrc/shells/bash/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/shells/bash/patches/patch-examples_loadables_finfo.c

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

Modified files:

Index: pkgsrc/shells/bash/Makefile
diff -u pkgsrc/shells/bash/Makefile:1.118 pkgsrc/shells/bash/Makefile:1.119
--- pkgsrc/shells/bash/Makefile:1.118   Mon Jul  7 19:43:20 2025
+++ pkgsrc/shells/bash/Makefile Thu Jul 10 14:36:20 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.118 2025/07/07 19:43:20 wiz Exp $
+# $NetBSD: Makefile,v 1.119 2025/07/10 14:36:20 jperkin Exp $
 
 BASH_VERSION=          5.3
 #BASH_PATCHLEVEL=      37
@@ -22,6 +22,7 @@ GNU_CONFIGURE=                yes
 MAKE_ENV+=             INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
 CONFIGURE_ARGS=                LOCAL_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS:M*:Q}
 CPPFLAGS+=             -DDEFAULT_PATH_VALUE="\"/sbin:/usr/sbin:/usr/bin:/bin:${PREFIX}/sbin:${PREFIX}/bin:/usr/local/sbin:/usr/local/bin\""
+BUILD_TARGET=          all loadables
 TEST_TARGET=           test
 
 PKGCONFIG_OVERRIDE=    support/bash.pc.in

Index: pkgsrc/shells/bash/distinfo
diff -u pkgsrc/shells/bash/distinfo:1.86 pkgsrc/shells/bash/distinfo:1.87
--- pkgsrc/shells/bash/distinfo:1.86    Sat Jul  5 08:28:43 2025
+++ pkgsrc/shells/bash/distinfo Thu Jul 10 14:36:20 2025
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.86 2025/07/05 08:28:43 wiz Exp $
+$NetBSD: distinfo,v 1.87 2025/07/10 14:36:20 jperkin Exp $
 
 BLAKE2s (bash-5.3.tar.gz) = 48e50ced4874740dc0f36bd19d0f7aab0cb5d6d4b04899e27143707fcab41d4c
 SHA512 (bash-5.3.tar.gz) = 05ef640e8ba011d10f858a270c626daa42ed5a75789d0298ae0ced9b2ebaf93d94d8ed5a211ac30cd34e82af8865e50024144c88a3c979bee7c38e449350e02e
 Size (bash-5.3.tar.gz) = 11354270 bytes
 SHA1 (patch-Makefile.in) = 5e5333bfbb7ea03207e01ea75caeca0d9c9ecdc0
 SHA1 (patch-examples_loadables_Makefile.in) = 0d27f82399c4ae9fae8ac0f8c48c68a23a3dcbd8
+SHA1 (patch-examples_loadables_finfo.c) = 3151c7cc860f263ff055654aadb61cc62141e157

Added files:

Index: pkgsrc/shells/bash/patches/patch-examples_loadables_finfo.c
diff -u /dev/null pkgsrc/shells/bash/patches/patch-examples_loadables_finfo.c:1.1
--- /dev/null   Thu Jul 10 14:36:20 2025
+++ pkgsrc/shells/bash/patches/patch-examples_loadables_finfo.c Thu Jul 10 14:36:20 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-examples_loadables_finfo.c,v 1.1 2025/07/10 14:36:20 jperkin Exp $
+
+MAJOR_IN_MKDEV is not in config.h so will never be defined, for now just go
+with the simple workaround for illumos which will definitely need mkdev.h.
+
+--- examples/loadables/finfo.c.orig    2025-07-10 14:29:10.112908803 +0000
++++ examples/loadables/finfo.c
+@@ -28,7 +28,7 @@
+ #endif
+ 
+ #include <sys/types.h>
+-#ifdef MAJOR_IN_MKDEV
++#if defined(MAJOR_IN_MKDEV) || defined(__illumos__)
+ #  include <sys/mkdev.h>
+ #endif
+ #ifdef MAJOR_IN_SYSMACROS