aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/build-toolchains.yml1
-rw-r--r--packages/expat/2.4.1/version.desc1
-rw-r--r--packages/expat/2.5.0/chksum17
-rw-r--r--packages/expat/2.5.0/version.desc (renamed from packages/picolibc/1.7.8/version.desc)0
-rw-r--r--packages/glibc/2.36/0006-Makerules-fix-MAKEFLAGS-assignment-for-upcoming-make.patch114
-rw-r--r--packages/newlib-nano/package.desc2
-rw-r--r--packages/newlib/package.desc2
-rw-r--r--packages/picolibc/1.7.8/chksum4
-rw-r--r--packages/picolibc/1.7.9/chksum4
-rw-r--r--packages/picolibc/1.7.9/version.desc0
-rw-r--r--scripts/functions3
11 files changed, 141 insertions, 7 deletions
diff --git a/.github/workflows/build-toolchains.yml b/.github/workflows/build-toolchains.yml
index 46792980..8634f83f 100644
--- a/.github/workflows/build-toolchains.yml
+++ b/.github/workflows/build-toolchains.yml
@@ -90,6 +90,7 @@ jobs:
sed -i -e '/CT_LOG_PROGRESS_BAR/s/y$/n/' .config
sed -i -e '/CT_LOCAL_TARBALLS_DIR/s/HOME/CT_TOP_DIR/' .config
sed -i -e '/CT_PREFIX_DIR/s/HOME/CT_TOP_DIR/' .config
+ test ${{ matrix.host }} = "macos-latest" && sed -i -e '/CT_GDB_CROSS_PYTHON/s/y$/n/' .config
ct-ng build
- name: create ${{ matrix.sample }}.${{ matrix.host }} tarball
if: ${{ matrix.sample == 'x86_64-w64-mingw32' }}
diff --git a/packages/expat/2.4.1/version.desc b/packages/expat/2.4.1/version.desc
index e69de29b..fcfe3891 100644
--- a/packages/expat/2.4.1/version.desc
+++ b/packages/expat/2.4.1/version.desc
@@ -0,0 +1 @@
+obsolete='yes'
diff --git a/packages/expat/2.5.0/chksum b/packages/expat/2.5.0/chksum
new file mode 100644
index 00000000..e81826d7
--- /dev/null
+++ b/packages/expat/2.5.0/chksum
@@ -0,0 +1,17 @@
+md5 expat-2.5.0.tar.xz ac6677b6d1b95d209ab697ce8b688704
+sha1 expat-2.5.0.tar.xz 5178e13c1e34f4643d5118d5758babfe0e836fe2
+sha256 expat-2.5.0.tar.xz ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe
+sha512 expat-2.5.0.tar.xz 2da73b991b7c0c54440485c787e5edeb3567230204e31b3cac1c3a6713ec6f9f1554d3afffc0f8336168dfd5df02db4a69bcf21b4d959723d14162d13ab87516
+md5 expat-2.5.0.tar.lz 4add8675872d4b923d9b7871dc0f24d3
+sha1 expat-2.5.0.tar.lz 9f767155627006b383f54078f2fa0d7df5b9d6e6
+sha256 expat-2.5.0.tar.lz 9a51edebc8c2910d8cc2b5e6b8d98350dea559922208f3e1a6bb5de33b6c2dc6
+sha512 expat-2.5.0.tar.lz 59ec89d471cda38fab853c85ff5ffc0631d6fa2c376e7246a933f8d317f037672e8142cf1408477f5724192a05ace1baa51a533c605a78532863d5f178e37c08
+md5 expat-2.5.0.tar.bz2 5e9974d422dc4b157f300568ad28ebf6
+sha1 expat-2.5.0.tar.bz2 36e29d7192ab8c5ce44d09375318a0a81395aab0
+sha256 expat-2.5.0.tar.bz2 6f0e6e01f7b30025fa05c85fdad1e5d0ec7fd35d9f61b22f34998de11969ff67
+sha512 expat-2.5.0.tar.bz2 22fd904d75aab7506a85c03519b9cf79e44898c8e1ba6abf6cb7f95de71b8e63a7e2d5cf4395e3627d46035ea29342b3e631a8809fef8aad3f59976dc075ad17
+md5 expat-2.5.0.tar.gz 686e9d986f85966c7924dfc041cdc15e
+sha1 expat-2.5.0.tar.gz 061c1232188dff35e44aa7137aec7757d3d90d27
+sha256 expat-2.5.0.tar.gz 6b902ab103843592be5e99504f846ec109c1abb692e85347587f237a4ffa1033
+sha512 expat-2.5.0.tar.gz f1ff7da5fafb47dcd6e0f0d892826aba6de76509c8497bc00382f1109ab8e2a93d396943dbb52216457044993a39d73728048adf650d8e83e28189edc7b78402
+
diff --git a/packages/picolibc/1.7.8/version.desc b/packages/expat/2.5.0/version.desc
index e69de29b..e69de29b 100644
--- a/packages/picolibc/1.7.8/version.desc
+++ b/packages/expat/2.5.0/version.desc
diff --git a/packages/glibc/2.36/0006-Makerules-fix-MAKEFLAGS-assignment-for-upcoming-make.patch b/packages/glibc/2.36/0006-Makerules-fix-MAKEFLAGS-assignment-for-upcoming-make.patch
new file mode 100644
index 00000000..c4475990
--- /dev/null
+++ b/packages/glibc/2.36/0006-Makerules-fix-MAKEFLAGS-assignment-for-upcoming-make.patch
@@ -0,0 +1,114 @@
+From 2d7ed98add14f75041499ac189696c9bd3d757fe Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Tue, 13 Sep 2022 13:39:13 -0400
+Subject: [PATCH] Makerules: fix MAKEFLAGS assignment for upcoming make-4.4
+ [BZ# 29564]
+
+make-4.4 will add long flags to MAKEFLAGS variable:
+
+ * WARNING: Backward-incompatibility!
+ Previously only simple (one-letter) options were added to the MAKEFLAGS
+ variable that was visible while parsing makefiles. Now, all options
+ are available in MAKEFLAGS.
+
+This causes locale builds to fail when long options are used:
+
+ $ make --shuffle
+ ...
+ make -C localedata install-locales
+ make: invalid shuffle mode: '1662724426r'
+
+The change fixes it by passing eash option via whitespace and dashes.
+That way option is appended to both single-word form and whitespace
+separated form.
+
+While at it fixed --silent mode detection in $(MAKEFLAGS) by filtering
+out --long-options. Otherwise options like --shuffle flag enable silent
+mode unintentionally. $(silent-make) variable consolidates the checks.
+
+Resolves: BZ# 29564
+
+CC: Paul Smith <psmith@gnu.org>
+CC: Siddhesh Poyarekar <siddhesh@gotplt.org>
+Signed-off-by: Sergei Trofimovich <slyich@gmail.com>
+Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
+---
+ Makeconfig | 18 +++++++++++++++++-
+ Makerules | 4 ++--
+ elf/rtld-Rules | 2 +-
+ 3 files changed, 20 insertions(+), 4 deletions(-)
+
+diff --git a/Makeconfig b/Makeconfig
+index f8164a0025..842f49eb58 100644
+--- a/Makeconfig
++++ b/Makeconfig
+@@ -43,6 +43,22 @@ else
+ $(error objdir must be defined by the build-directory Makefile)
+ endif
+
++# Did we request 'make -s' run? "yes" or "no".
++# Starting from make-4.4 MAKEFLAGS now contains long
++# options like '--shuffle'. To detect presence of 's'
++# we pick first word with short options. Long options
++# are guaranteed to come after whitespace. We use '-'
++# prefix to always have a word before long options
++# even if no short options were passed.
++# Typical MAKEFLAGS values to watch for:
++# "rs --shuffle=42" (silent)
++# " --shuffle" (not silent)
++ifeq ($(findstring s, $(firstword -$(MAKEFLAGS))),)
++silent-make := no
++else
++silent-make := yes
++endif
++
+ # Root of the sysdeps tree.
+ sysdep_dir := $(..)sysdeps
+ export sysdep_dir := $(sysdep_dir)
+@@ -917,7 +933,7 @@ endif
+ # umpteen zillion filenames along with it (we use `...' instead)
+ # but we don't want this echoing done when the user has said
+ # he doesn't want to see commands echoed by using -s.
+-ifneq "$(findstring s,$(MAKEFLAGS))" "" # if -s
++ifeq ($(silent-make),yes) # if -s
+ +cmdecho := echo >/dev/null
+ else # not -s
+ +cmdecho := echo
+diff --git a/Makerules b/Makerules
+index d1e139d03c..09c0cf8357 100644
+--- a/Makerules
++++ b/Makerules
+@@ -794,7 +794,7 @@ endif
+ # Maximize efficiency by minimizing the number of rules.
+ .SUFFIXES: # Clear the suffix list. We don't use suffix rules.
+ # Don't define any builtin rules.
+-MAKEFLAGS := $(MAKEFLAGS)r
++MAKEFLAGS := $(MAKEFLAGS) -r
+
+ # Generic rule for making directories.
+ %/:
+@@ -811,7 +811,7 @@ MAKEFLAGS := $(MAKEFLAGS)r
+ .PRECIOUS: $(foreach l,$(libtypes),$(patsubst %,$(common-objpfx)$l,c))
+
+ # Use the verbose option of ar and tar when not running silently.
+-ifeq "$(findstring s,$(MAKEFLAGS))" "" # if not -s
++ifeq ($(silent-make),no) # if not -s
+ verbose := v
+ else # -s
+ verbose :=
+diff --git a/elf/rtld-Rules b/elf/rtld-Rules
+index ca00dd1fe2..3c5e273f2b 100644
+--- a/elf/rtld-Rules
++++ b/elf/rtld-Rules
+@@ -52,7 +52,7 @@ $(objpfx)rtld-libc.a: $(foreach dir,$(rtld-subdirs),\
+ mv -f $@T $@
+
+ # Use the verbose option of ar and tar when not running silently.
+-ifeq "$(findstring s,$(MAKEFLAGS))" "" # if not -s
++ifeq ($(silent-make),no) # if not -s
+ verbose := v
+ else # -s
+ verbose :=
+--
+2.38.1
+
diff --git a/packages/newlib-nano/package.desc b/packages/newlib-nano/package.desc
index ba18016a..8082c940 100644
--- a/packages/newlib-nano/package.desc
+++ b/packages/newlib-nano/package.desc
@@ -2,7 +2,7 @@ origin='RedHat'
repository='git git://sourceware.org/git/newlib-cygwin.git'
# Do not use "$(CT_Mirrors sourceware newlib)" here: the mirrors (kernel.org
# and gnu.org) only store some older releases of newlib (2.0.0 and before).
-mirrors='ftp://sourceware.org/pub/newlib'
+mirrors='https://sourceware.org/pub/newlib'
relevantpattern='*.*|.*. *.*|.'
archive_filename='newlib-@{version}'
archive_dirname='newlib-@{version}'
diff --git a/packages/newlib/package.desc b/packages/newlib/package.desc
index 27a5fa6e..f3801daf 100644
--- a/packages/newlib/package.desc
+++ b/packages/newlib/package.desc
@@ -2,6 +2,6 @@ origin='RedHat'
repository='git git://sourceware.org/git/newlib-cygwin.git'
# Do not use "$(CT_Mirrors sourceware newlib)" here: the mirrors (kernel.org
# and gnu.org) only store some older releases of newlib (2.0.0 and before).
-mirrors='ftp://sourceware.org/pub/newlib'
+mirrors='https://sourceware.org/pub/newlib'
relevantpattern='*.*|.*. *.*|.'
archive_formats='.tar.gz'
diff --git a/packages/picolibc/1.7.8/chksum b/packages/picolibc/1.7.8/chksum
deleted file mode 100644
index 60d37808..00000000
--- a/packages/picolibc/1.7.8/chksum
+++ /dev/null
@@ -1,4 +0,0 @@
-md5 picolibc-1.7.8.tar.xz 2e05738d06d7dea791eb633c12aa4d62
-sha1 picolibc-1.7.8.tar.xz dae98084735523586da37ab9b7e3b3a831a38b7b
-sha256 picolibc-1.7.8.tar.xz b0bddaf1cafbe0fa72e55bd27895b24d30f2a03ebc0e5b3dd2046d4cefe1c158
-sha512 picolibc-1.7.8.tar.xz 9ea2b0341ed8c76e799e03e1aa0b06e7c4b0b49b4f55f57126ae1c9e70c0584594575bef2d1d3f21db1e96a51118bd842a433e214d7bdce05d6ada5ff483da5e
diff --git a/packages/picolibc/1.7.9/chksum b/packages/picolibc/1.7.9/chksum
new file mode 100644
index 00000000..2b39d8b3
--- /dev/null
+++ b/packages/picolibc/1.7.9/chksum
@@ -0,0 +1,4 @@
+md5 picolibc-1.7.9.tar.xz 23c37660dda10c32f1fd1f280ed97913
+sha1 picolibc-1.7.9.tar.xz b082feda14c8fb95b2b1e4beff714eb99bdd9c52
+sha256 picolibc-1.7.9.tar.xz 4b0042344fe7be61adf44ae098f94e21a90ac5179152b3a5ea779451c8e914ab
+sha512 picolibc-1.7.9.tar.xz 71f15f274ff406042ac9f8c074bc4cc003d4d47fca1bef12abe7409e5c439a73d9a34a711d5ca22a40a98a828c9db2553baf5e071176db3c835daf727a18ea78
diff --git a/packages/picolibc/1.7.9/version.desc b/packages/picolibc/1.7.9/version.desc
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/packages/picolibc/1.7.9/version.desc
diff --git a/scripts/functions b/scripts/functions
index 0d799ae6..09fa29af 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -2283,10 +2283,11 @@ CT_DoExtractPatch()
CT_DoExecLog ALL rm -f "${src_dir}/.${basename}".*
fi
- if [ -f "${src_dir}/.${basename}.extracted" ]; then
+ if [ -f "${src_dir}/.${basename}.extracted" -a -d "${src_dir}/${basename}" ]; then
CT_DoLog DEBUG "Already extracted ${basename}"
else
CT_DoLog EXTRA "Extracting ${basename}"
+ CT_DoExecLog ALL rm -f "${src_dir}/.${basename}".*
CT_DoExecLog ALL touch "${src_dir}/.${basename}.extracting"
if [ "${src_release}" = "y" ]; then
archive="${archive_filename}"
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-14 20:13:58 +0000