picolibc: Update to version 1.8.8

The specs prefix patch was upstreamed, so we don't need it any longer.

Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Keith Packard 2024-09-29 21:57:23 -07:00 committed by Chris Packham
parent 246f46c1cb
commit 4d36f2700f
4 changed files with 4 additions and 64 deletions

View File

@ -1,60 +0,0 @@
From cf914a3a79578bc97d80c3d3a0090b2fab0eb834 Mon Sep 17 00:00:00 2001
From: Alexey Lapshin <alexey.lapshin@espressif.com>
Date: Thu, 1 Aug 2024 17:00:55 +0700
Subject: [PATCH] fix specs_prefix_format to point to root toolchain's
directory
---
meson.build | 35 +++++++++++++++++++++++++++--------
1 file changed, 27 insertions(+), 8 deletions(-)
--- a/meson.build
+++ b/meson.build
@@ -500,20 +500,39 @@
endif
if sysroot_install
+ # Get 'sysroot' or 'GCC_EXEC_PREFIX' from GCC output
sysroot = run_command(cc.cmd_array() + ['-print-sysroot'], check : true).stdout().split('\n')[0]
if sysroot != ''
- specs_prefix_format = '%R/@0@'
+ specs_prefix_format_format = '%R/@0@'
+ specs_prefix_format_default = '%R/@0@'
else
- sysroot = cc_install_dir + '../../../..'
- specs_prefix_format = '%:getenv(GCC_EXEC_PREFIX ../../@0@)'
- endif
- if not get_option('sysroot-install-skip-checks')
- if sysroot == ''
+ if not get_option('sysroot-install-skip-checks')
error('sysroot install requested, but compiler has no sysroot')
endif
- if not fs.is_samepath(sysroot, prefix)
- error('sysroot install requires --prefix=' + sysroot)
+ sysroot = run_command(cc.cmd_array() + ['-print-search-dirs'], check : true).stdout().split('\n')[0].split(' ')[1]
+ specs_prefix_format_format = '%:getenv(GCC_EXEC_PREFIX @0@)'
+ specs_prefix_format_default = '%:getenv(GCC_EXEC_PREFIX ../../@0@)'
+ endif
+
+ # Try to calculate relative path from sysroot to prefix
+ specs_prefix_format = ''
+ if fs.exists(sysroot)
+ sysroot_to_prefix_correction = ''
+ foreach _ : sysroot.split('/')
+ if fs.is_samepath(sysroot + '/' + sysroot_to_prefix_correction, prefix)
+ specs_prefix_format = specs_prefix_format_format.format(sysroot_to_prefix_correction + '@0@')
+ break
+ endif
+ sysroot_to_prefix_correction += '../'
+ endforeach
+ endif
+
+ # Use default 'specs_prefix_format' if can not have relative sysroot path
+ if specs_prefix_format == ''
+ if not get_option('sysroot-install-skip-checks')
+ error('sysroot install requires sysroot(' + sysroot + ') to be a subdirectory of --prefix=<PATH>(' + prefix + ')')
endif
+ specs_prefix_format = specs_prefix_format_default
endif
else
specs_prefix_format = prefix + '/@0@'

View File

@ -1,4 +0,0 @@
md5 picolibc-1.8.6.tar.xz c6972e4d6e6e7b1275ae8dc80eadb269
sha1 picolibc-1.8.6.tar.xz a8b1148c782dc931e8c2e41bfe8062192df3f5e9
sha256 picolibc-1.8.6.tar.xz 9549aac02bef6b2761af124392a7ffc6bbc8dfc8541b698ac032567b516c9b34
sha512 picolibc-1.8.6.tar.xz f7e03aed7f24fb7a52f1e44bc244abccb72159b01c591aa68c43499f320765a559e4cdfd996bec855447781d8db311bc34f111a4d233cfdaa783f8347bf03f09

4
packages/picolibc/1.8.8/chksum vendored Normal file
View File

@ -0,0 +1,4 @@
md5 picolibc-1.8.8.tar.xz f895a09650b665dd68ae74780008c182
sha1 picolibc-1.8.8.tar.xz ee70ebe5ed56e25f70cfb78ac1830f547a9baa03
sha256 picolibc-1.8.8.tar.xz 565f335e39ba8dfcf3f100b61c929af4861269ae983b4493568f55c5eaa26538
sha512 picolibc-1.8.8.tar.xz fc7f7a4af5ecc4b5f6e85fe1b4d318dca9555c6d19f59795db29f76e83b48e87f806f2043d96c07028c6748f032b801a0ed68306d28628fd124d8da215510c13