Merge pull request #1364 from hadfl/perl

update aarch64 miniperl to 5.38.0
omniosorg · Nov 14, 2023 · ecca8a1 · ecca8a1
2 parents d45e37d + 602a602
commit ecca8a1
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 10 deletions.
diff --git a/build/aarch64/perl/build.sh b/build/aarch64/perl/build.sh
@@ -13,18 +13,18 @@
 # }}}
 
 # Copyright 2011-2017 OmniTI Computer Consulting, Inc.  All rights reserved.
-# Copyright 2022 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2023 OmniOS Community Edition (OmniOSce) Association.
 
 . ../common.sh
 
 PROG=perl
 PKG=ooce/developer/aarch64-perl
-VER=5.36.0
+VER=5.38.0
 MAJVER=${VER%.*}
 SUMMARY="Perl $MAJVER Programming Language"
 DESC="A highly capable, feature-rich programming language"
 
-CROSSVER=1.4
+CROSSVER=1.5
 
 set_arch 64
 CTF_FLAGS+=" -s"
@@ -35,6 +35,7 @@ PREFIX+=/perl5/$MAJVER
 XFORM_ARGS="
     -DPREFIX=${PREFIX#/}
     -DPROG=$PROG
+    -DMAJVER=$MAJVER
 "
 
 # Perl bundles a lot of shared objects with its extensions
@@ -139,7 +140,8 @@ patch_source
 # building miniperl is racy
 MAKE_JOBS= MAKE_ARGS="miniperl" build
 configure_amd64() { :; }
-MAKE_ARGS="modules" build
+MAKE_ARGS="xconfig.h modules" build
+xform files/perl > $TMPDIR/perl
 make_package
 clean_up
 

diff --git a/build/aarch64/perl/files/perl b/build/aarch64/perl/files/perl
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-pfx=/opt/cross/aarch64/perl5/5.36
+pfx=/opt/cross/aarch64/perl5/$(MAJVER)
 $pfx/bin/miniperl -I$pfx/lib/aarch64-solaris-64 "$@"
 
diff --git a/build/aarch64/perl/local.mog b/build/aarch64/perl/local.mog
@@ -8,9 +8,9 @@
 # source. A copy of the CDDL is also available via the Internet at
 # http://www.illumos.org/license/CDDL.
 
-# Copyright 2022 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2023 OmniOS Community Edition (OmniOSce) Association.
 
-file files/$(PROG) path=$(PREFIX)/bin/$(PROG) \
+file ../$(PROG) path=$(PREFIX)/bin/$(PROG) \
     mode=0755 owner=root group=bin
 
 link path=$(PREFIX)/lib/ExtUtils target=aarch64-solaris-64/ExtUtils

diff --git a/build/aarch64/perl/patches/nanosleep.patch b/build/aarch64/perl/patches/nanosleep.patch
@@ -1,9 +1,9 @@
 $d_nanosleep somehow ends up empty (instead of define/undef)
 for cross builds which leads to a syntax error
-diff -wpruN '--exclude=*.orig' a~/config_h.SH a/config_h.SH
+diff -wpruN --no-dereference '--exclude=*.orig' a~/config_h.SH a/config_h.SH
 --- a~/config_h.SH	1970-01-01 00:00:00
 +++ a/config_h.SH	1970-01-01 00:00:00
-@@ -3111,7 +3111,7 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#und
+@@ -3116,7 +3116,7 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#und
   *	This symbol, if defined, indicates that the nanosleep
   *	system call is available to sleep with 1E-9 sec accuracy.
   */

diff --git a/build/meta/extra-build-tools.p5m b/build/meta/extra-build-tools.p5m
@@ -120,3 +120,7 @@ depend fmri=ooce/developer/clang-16 type=conditional \
 depend fmri=ooce/developer/llvm-17 type=conditional \
     predicate=release/[email protected]
 
+# clang 17 is the default clang compiler from r151049 onwards
+depend fmri=ooce/developer/clang-17 type=conditional \
+    predicate=release/[email protected]
+
diff --git a/lib/config.sh b/lib/config.sh
@@ -363,7 +363,8 @@ esac
 case $RELVER in
     15104[3-4])         DEFAULT_CLANG_VER=14 ;;
     15104[5-6])         DEFAULT_CLANG_VER=15 ;;
-    15104[7-9])         DEFAULT_CLANG_VER=16 ;;
+    15104[7-8])         DEFAULT_CLANG_VER=16 ;;
+    151049|15105[0-9])  DEFAULT_CLANG_VER=17 ;;
     *)                  DEFAULT_CLANG_VER=13 ;;
 esac