Merge pull request #270 from rhubert/perl+c23

Perl+c23

Author: jkloetzke

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