Perl+c23

classes/basement/rootrecipe.yaml

@@ -32,6 +32,9 @@ depends:
           - name: devel::make
             use: [tools]
             forward: True
+          - name: perl::perl
+            use: [tools]
+            forward: True
           - name: devel::m4
             use: [tools]
             forward: True

classes/install.yaml

@@ -10,7 +10,7 @@ inherit: [strip, "basement::bits::libs"]
 # be adapted to promote *.private dependencies to regular dependencies (We do
 # not pass --static to pkg-config.  Executables are still linked dynamically
 # because glibc cannot be linked statically).
-packageVars: [READELF]
+packageVars: [READELF, INSTALL_APPLY_SHEBANG_FIXUP]
 packageSetup: |
     case "$(basementBitsLibraryType)" in
         shared|both)
@@ -163,6 +163,25 @@ packageSetup: |
         fi
     }
 
+    # replace absolute interpreter paths with /usr/bin/env <interpreter>
+    installFixShebang()
+    {
+        local f old new
+        while IFS= read -r -d $'\0' f; do
+            if cmp -s -n2 "$f" <<<'#!' ; then
+                read -r old_cmd old_arg < "$f"
+                if [[ "$old_cmd" == "#!/usr/bin/env" ]]; then
+                    continue
+                else
+                    old_cmd="${old_cmd:2}"
+                    old_cmd="${old_cmd##*/}"
+                fi
+                new="#!/usr/bin/env ${old_arg:+-S }${old_cmd}${old_arg:+ ${old_arg@Q}}"
+                sed -i -e "1c $new" "$f"
+            fi
+       done < <(find "${1:-.}" -type f -perm -/111 -print0)
+    }
+
     # Everything except shared or static libraries or header files.
     installPackageBin()
     {
@@ -173,6 +192,9 @@ packageSetup: |
             "!/usr/share/pkgconfig" \
             "!/usr/lib/cmake"
         installStripAll .
+        if [[ ${INSTALL_APPLY_SHEBANG_FIXUP:-yes} != no ]] ; then
+            installFixShebang
+        fi
     }
 
     installPackageTgt()

classes/perl5.yaml

@@ -0,0 +1,11 @@
+buildTools: [perl]
+buildSetup: &ref |
+    PERL5LIB=
+    for i in "${!BOB_ALL_PATHS[@]}" ; do
+        if [[ -d ${BOB_ALL_PATHS[$i]}/usr/lib/perl5/site_perl ]]; then
+            PERL5LIB+="${PERL5LIB:+:}${BOB_ALL_PATHS[$i]}/usr/lib/perl5/site_perl"
+        fi
+    done
+    export PERL5LIB
+
+packageSetup: *ref

classes/perl5/build.yaml

@@ -0,0 +1,14 @@
+inherit: [perl5, 'basement::bits::libs']
+
+depends:
+    - name: perl::perl-dev
+      use: [result, deps, environment]
+
+buildVars: [AUTOCONF_BUILD, AUTOCONF_HOST, PERL_ARCH, PERL_VERSION]
+buildSetup: |
+    export PERL_INC=${BOB_DEP_PATHS['perl::perl-dev']}/usr/lib/perl5/${PERL_VERSION}/${PERL_ARCH}/CORE
+    export PERL_SRC=${BOB_DEP_PATHS['perl::perl-dev']}/usr/lib/perl5/${PERL_VERSION}
+    export PERL_ARCHLIB=${BOB_DEP_PATHS['perl::perl-dev']}/usr/lib/perl5/${PERL_VERSION}/${PERL_ARCH}
+    if basementBitsCrossCompiling; then
+      export PERLCONFIGTARGET=yes
+    fi

recipes/devel/autoconf-2.69.yaml

@@ -16,7 +16,7 @@ checkoutScript: |
     # Prevent that...
     touch man/*.1
 
-buildTools: [m4]
+buildTools: [m4, perl]
 buildScript: |
     export EMACS="no"
     export HELP2MAN=false

recipes/devel/autoconf.yaml

@@ -16,7 +16,7 @@ checkoutScript: |
     # Prevent that...
     touch man/*.1
 
-buildTools: [m4]
+buildTools: [m4, perl]
 buildScript: |
     export EMACS="no"
     export HELP2MAN=false
@@ -33,4 +33,6 @@ packageScript: |
         usr/share/autoconf/m4sugar/m4sh.m4
 
 provideTools:
-    autoconf: "usr/bin"
+    autoconf:
+        path: "usr/bin"
+        dependTools: ["perl"]

recipes/devel/automake.yaml

@@ -16,7 +16,7 @@ checkoutDeterministic: True
 checkoutScript: |
     patchApplySeries $<@automake/*.patch@>
 
-buildTools: [m4, help2man]
+buildTools: [m4, help2man, perl]
 buildScript: |
     export PATH="${BOB_DEP_PATHS[devel::autoconf]}/usr/bin:$PATH"
     autotoolsNoarchBuild $1
@@ -25,4 +25,6 @@ packageScript: |
     autotoolsNoarchPackageTgt
 
 provideTools:
-    automake: "usr/bin"
+    automake:
+        path: "usr/bin"
+        dependTools: ["perl"]

recipes/devel/autotools-2.69.yaml

@@ -18,4 +18,6 @@ buildScript: |
 packageScript: |
     cp -a $1/* .
 provideTools:
-    autotools: usr/bin
+    autotools:
+        path: "usr/bin"
+        dependTools: ["perl"]

recipes/devel/autotools.yaml

@@ -18,4 +18,6 @@ buildScript: |
 packageScript: |
     cp -a $1/* .
 provideTools:
-    autotools: usr/bin
+    autotools:
+        path: "usr/bin"
+        dependTools: ["perl"]

recipes/devel/binutils.yaml

@@ -1,12 +1,12 @@
 inherit: [autotools, patch]
 
 metaEnvironment:
-    PKG_VERSION: "2.42"
+    PKG_VERSION: "2.45"
 
 checkoutSCM:
     scm: url
     url: ${GNU_MIRROR}/binutils/binutils-${PKG_VERSION}.tar.xz
-    digestSHA1: "44da41792c60419863d7e13fa1deaf6b24dd69b8"
+    digestSHA1: "09fd8a50a95be4a94412fe3847d16280996679c5"
     stripComponents: 1
 
 checkoutDeterministic: True

recipes/devel/bootstrap-sandbox.yaml

@@ -16,6 +16,10 @@ depends:
         name: devel::make
         use: [tools]
         forward: True
+    -
+        name: perl::perl
+        use: [tools]
+        forward: True
     -
         name: devel::m4
         use: [tools]
@@ -72,7 +76,6 @@ depends:
     - devel::patch
     - editors::ed
     - net::make-ca
-    - perl::perl
     - utils::bash
     - utils::bzip2
     - utils::file

recipes/devel/help2man.yaml

@@ -8,7 +8,7 @@ checkoutSCM:
     digestSHA1: "3ed88430c97af3c5b57949f6f030b913044af507"
     stripComponents: 1
 
-buildTools: [host-toolchain]
+buildTools: [host-toolchain, perl]
 buildScript: |
     autotoolsBuild $1
 

recipes/devel/host-compat-toolchain.yaml

@@ -15,6 +15,9 @@ depends:
     - name: devel::make
       use: [tools]
       forward: True
+    - name: perl::perl
+      use: [tools]
+      forward: True
     - name: devel::m4
       use: [tools]
       forward: True

recipes/devel/m4.yaml

@@ -1,12 +1,12 @@
 inherit: [autotools]
 
 metaEnvironment:
-    PKG_VERSION: "1.4.19"
+    PKG_VERSION: "1.4.20"
 
 checkoutSCM:
     scm: url
     url: ${GNU_MIRROR}/m4/m4-${PKG_VERSION}.tar.xz
-    digestSHA256: "63aede5c6d33b6d9b13511cd0be2cac046f2e70fd0a07aa9573a04a82783af96"
+    digestSHA256: "e236ea3a1ccf5f6c270b1c4bb60726f371fa49459a8eaaebc90b216b328daf2b"
     stripComponents: 1
 
 buildScript: |

recipes/devel/pkg-config.yaml

@@ -4,12 +4,12 @@
 inherit: [libtool, patch]
 
 metaEnvironment:
-    PKG_VERSION: "0.29.1"
+    PKG_VERSION: "0.29.2"
 
 checkoutSCM:
     scm: url
     url: https://pkg-config.freedesktop.org/releases/pkg-config-${PKG_VERSION}.tar.gz
-    digestSHA1: "271ce928f6d673cc16cbced2bfd14a5f2e5d3d37"
+    digestSHA1: "76e501663b29cb7580245720edfb6106164fad2b"
     stripComponents: 1
 
 checkoutDeterministic: True

recipes/devel/pkg-config/0001-Do-not-use-bool-as-a-field-name.patch

@@ -0,0 +1,36 @@
+From b3b26a7e125e5e4f5b69975cc17eb6d33198ebaa Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi@gnome.org>
+Date: Thu, 11 Apr 2024 14:40:21 +0100
+Subject: [PATCH] Do not use bool as a field name
+
+C99 aliases `bool` to `_Bool`, and C23 introduces `bool` as a reserved
+keyword. Let's avoid using `bool` as a field name.
+
+Upstream-Status: Backport [Backport from glib to bunlded version in pkg-config https://github.com/GNOME/glib/commit/9e320e1c43a4770ed1532248fe5416eb0c618120]
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+ glib/glib/goption.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/glib/glib/goption.c b/glib/glib/goption.c
+index 0a22f6f..f439fd4 100644
+--- a/glib/glib/goption.c
++++ b/glib/glib/goption.c
+@@ -166,7 +166,7 @@ typedef struct
+   gpointer arg_data;
+   union
+   {
+-    gboolean bool;
++    gboolean boolean;
+     gint integer;
+     gchar *str;
+     gchar **array;
+@@ -1600,7 +1600,7 @@ free_changes_list (GOptionContext *context,
+           switch (change->arg_type)
+             {
+             case G_OPTION_ARG_NONE:
+-              *(gboolean *)change->arg_data = change->prev.bool;
++              *(gboolean *)change->arg_data = change->prev.boolean;
+               break;
+             case G_OPTION_ARG_INT:
+               *(gint *)change->arg_data = change->prev.integer;

recipes/devel/sandbox.yaml

@@ -25,6 +25,10 @@ depends:
         name: devel::make
         use: [tools]
         forward: True
+    -
+        name: perl::perl
+        use: [tools]
+        forward: True
     -
         name: devel::m4
         use: [tools]
@@ -81,8 +85,14 @@ depends:
     - devel::git
     - devel::patch
     - editors::ed
+    # Our host-compat-toolchain uses glibc 2.31 ATM. This version
+    # still had libcrypt support which was later removed in glibc 2.38.
+    # Since we have glibc 2.39 the is no libxcrypt in the sandbox and thus
+    # tools linked shared against the host-compat toolchains libcrypt can
+    # not be started without libxcrypt. It should be safe to remove it once
+    # we update host-compat toolchain.
+    - libs::libxcrypt-tgt
     - net::make-ca
-    - perl::perl
     - utils::bash
     - utils::bc
     - utils::bzip2

recipes/libs/gmp.yaml

@@ -1,4 +1,4 @@
-inherit: [autotools, autoconf]
+inherit: [autotools, autoconf, patch]
 
 privateEnvironment:
     APPLY_UPDATE_CONFIG: "no"
@@ -14,6 +14,7 @@ checkoutSCM:
 
 checkoutDeterministic: True
 checkoutScript: |
+    patchApplySeries $<@gmp/*.patch@>
     updateConfigFile config.guess configfsf.guess
     updateConfigFile config.sub configfsf.sub
     autoconfReconfigure

recipes/libs/gmp/0001-Complete-function-prototype-in-acinclude.m4-for-C23-.patch

@@ -0,0 +1,53 @@
+https://git.buildroot.net/buildroot/plain/package/gmp/0001-Complete-function-prototype-in-acinclude.m4-for-C23-.patch
+
+From 9cd0c36d0110191a5f42e268d7bd21a95a2aa883 Mon Sep 17 00:00:00 2001
+From: Marc Glisse <marc.glisse@inria.fr>
+Date: Wed, 29 Jan 2025 22:38:02 +0100
+Subject: [PATCH] Complete function prototype in acinclude.m4 for C23
+ compatibility
+
+Add parameter names to function prototype
+
+Upstream: https://gmplib.org/repo/gmp/rev/d66d66d82dbb
+Upstream: https://gmplib.org/repo/gmp/rev/8e7bb4ae7a18
+Signed-off-by: Marc Glisse <marc.glisse@inria.fr>
+[Julien: git patch adapted from two upstream mercurial changesets]
+Signed-off-by: Julien Olivain <ju.o@free.fr>
+---
+ ChangeLog    | 9 +++++++++
+ acinclude.m4 | 2 +-
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 2902cd2..d808a8b 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,12 @@
++2025-03-15  Khem Raj <raj.khem@gmail.com>
++
++	* acinclude.m4: Add parameter names to function prototype.
++
++2025-01-29  Rudi Heitbaum <rudi@heitbaum.com>
++	    Marc Glisse <marc.glisse@inria.fr>
++
++	* acinclude.m4: Complete function prototype.
++
+ 2023-07-29  Torbjörn Granlund  <tg@gmplib.org>
+
+ 	* Version 6.3.0 released.
+diff --git a/acinclude.m4 b/acinclude.m4
+index 9cf9483..b79a431 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -609,7 +609,7 @@ GMP_PROG_CC_WORKS_PART([$1], [long long reliability test 1],
+
+ #if defined (__GNUC__) && ! defined (__cplusplus)
+ typedef unsigned long long t1;typedef t1*t2;
+-void g(){}
++void g(int a,t1 const*b,t1 c,t2 d,t1 const*e,int f){}
+ void h(){}
+ static __inline__ t1 e(t2 rp,t2 up,int n,t1 v0)
+ {t1 c,x,r;int i;if(v0){c=1;for(i=1;i<n;i++){x=up[i];r=x+1;rp[i]=r;}}return c;}
+-- 
+2.49.0
+

recipes/libs/libxcrypt.yaml

@@ -0,0 +1,19 @@
+inherit: [autoconf, autotools]
+
+metaEnvironment:
+    PKG_VERSION: 4.4.36
+
+checkoutSCM:
+    scm: url
+    url: https://github.com/besser82/libxcrypt/releases/download/v${PKG_VERSION}/libxcrypt-${PKG_VERSION}.tar.xz
+    digestSHA256: e5e1f4caee0a01de2aee26e3138807d6d3ca2b8e67287966d1fefd65e1fd8943
+    stripComponents: 1
+
+buildScript: |
+    autotoolsBuild $1
+
+multiPackage:
+    dev:
+        packageScript: autotoolsPackageDev
+    tgt:
+        packageScript: autotoolsPackageTgt