diff options
| -rw-r--r-- | packages/picolibc/1.7.1/chksum | 4 | ||||
| -rw-r--r-- | packages/picolibc/1.7.1/version.desc | 0 | ||||
| -rw-r--r-- | packages/picolibc/package.desc | 2 | ||||
| -rw-r--r-- | scripts/build/companion_libs/340-picolibc.sh | 1 | ||||
| -rw-r--r-- | scripts/build/debug/300-gdb.sh | 6 | ||||
| -rw-r--r-- | scripts/functions | 8 |
6 files changed, 17 insertions, 4 deletions
diff --git a/packages/picolibc/1.7.1/chksum b/packages/picolibc/1.7.1/chksum new file mode 100644 index 0000000..e20e9a9 --- /dev/null +++ b/packages/picolibc/1.7.1/chksum @@ -0,0 +1,4 @@ +md5 picolibc-1.7.1.tar.xz c35296fa0eeb625f6664ae80ea252b09 +sha1 picolibc-1.7.1.tar.xz 3b1948feee5d1c5325fbc81963e6d5480aa9b927 +sha256 picolibc-1.7.1.tar.xz 6301c22c385d299c4fbb36e23b55a4e65b7a14952ee62c8638a535063a310857 +sha512 picolibc-1.7.1.tar.xz 03bf635841e8f96e8a675162693f7275f907ae4dd97e51c962d969c2b9c721240625c0e7d9582a41804913c36c1db15844ccabd0926ceda67ffb169b29a5d5f6 diff --git a/packages/picolibc/1.7.1/version.desc b/packages/picolibc/1.7.1/version.desc new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/packages/picolibc/1.7.1/version.desc diff --git a/packages/picolibc/package.desc b/packages/picolibc/package.desc index 63d89c9..15206e6 100644 --- a/packages/picolibc/package.desc +++ b/packages/picolibc/package.desc @@ -1,6 +1,6 @@ origin='keithp.com' repository='git https://github.com/picolibc/picolibc.git' -milestones='1.4 1.5 1.6' +milestones='1.4 1.5 1.6 1.7' relevantpattern='*.*|.*. *.*|.' archive_formats='.tar.xz' mirrors='https://github.com/picolibc/picolibc/releases/download/${CT_PICOLIBC_VERSION}' diff --git a/scripts/build/companion_libs/340-picolibc.sh b/scripts/build/companion_libs/340-picolibc.sh index 525497a..cb96e71 100644 --- a/scripts/build/companion_libs/340-picolibc.sh +++ b/scripts/build/companion_libs/340-picolibc.sh @@ -40,6 +40,7 @@ do_cc_libstdcxx_picolibc() final_opts+=( "lang_list=c,c++" ) final_opts+=( "build_step=libstdcxx" ) final_opts+=( "extra_config+=('--enable-stdio=stdio_pure')" ) + final_opts+=( "extra_config+=('--disable-wchar_t')" ) if [ "${CT_LIBC_PICOLIBC_ENABLE_TARGET_OPTSPACE}" = "y" ]; then final_opts+=( "enable_optspace=yes" ) fi diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh index e6eec2a..75c683d 100644 --- a/scripts/build/debug/300-gdb.sh +++ b/scripts/build/debug/300-gdb.sh @@ -230,10 +230,16 @@ do_gdb_backend() if [ "${static}" = "y" ]; then cflags+=" -static" ldflags+=" -static" + # There is no static libsource-highlight + extra_config+=("--disable-source-highlight") fi if [ "${static_libstdcxx}" = "y" ]; then ldflags+=" -static-libgcc" ldflags+=" -static-libstdc++" + # libsource-highlight is a dynamic library that uses exception + # exceptions are handled by libstdc++ + # this combination is very buggy, so configure don't use it and abort + extra_config+=("--disable-source-highlight") fi diff --git a/scripts/functions b/scripts/functions index 11717e4..da90980 100644 --- a/scripts/functions +++ b/scripts/functions @@ -2240,6 +2240,7 @@ CT_DoExtractPatch() local bundled_patch_dir local bundled_common_patch_dir local local_patch_dir + local local_common_patch_dir local overlay # Inherit global value if requested @@ -2315,12 +2316,13 @@ CT_DoExtractPatch() bundled_patch_dir="${CT_LIB_DIR}/packages/${pkg_dir}" bundled_common_patch_dir="${CT_LIB_DIR}/packages/${pkg_name}" local_patch_dir="${CT_LOCAL_PATCH_DIR}/${pkg_dir}" + local_common_patch_dir="${CT_LOCAL_PATCH_DIR}/${pkg_name}" case "${patch_order}" in bundled) patch_dirs=("${bundled_patch_dir}" "${bundled_common_patch_dir}");; - local) patch_dirs=("${local_patch_dir}");; - bundled,local) patch_dirs=("${bundled_patch_dir}" "${bundled_common_patch_dir}" "${local_patch_dir}");; - local,bundled) patch_dirs=("${local_patch_dir}" "${bundled_patch_dir}" "${bundled_common_patch_dir}");; + local) patch_dirs=("${local_patch_dir}" "${local_common_patch_dir}");; + bundled,local) patch_dirs=("${bundled_patch_dir}" "${bundled_common_patch_dir}" "${local_patch_dir}" "${local_common_patch_dir}");; + local,bundled) patch_dirs=("${local_patch_dir}" "${local_common_patch_dir}" "${bundled_patch_dir}" "${bundled_common_patch_dir}");; none) patch_dirs=;; esac |