Merge branch 'TurBoTse:main' into main2

vipshmily · Oct 21, 2024 · 4beb6f5 · 4beb6f5
2 parents 89a2570 + e47fca7
commit 4beb6f5
Show file tree

Hide file tree

Showing 45 changed files with 1,040 additions and 949 deletions.
diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ This project is based on original rt-n56u with latest mtk 4.4.198 kernel, which
 - Added ccache support, may save up to 50%+ build time
 - Upgraded the toolchain and libc:
   - gcc 13.3.0
-  - musl 1.2.5 / uClibc-ng 1.0.48
+  - musl 1.2.5 / uClibc-ng 1.0.50
  - OpenWrt style package Makefile
  - Enabled kernel cgroups support
  - Fixed K2P led label names

diff --git a/toolchain/config/libc/glibc.in b/toolchain/config/libc/glibc.in
@@ -68,7 +68,7 @@ config GLIBC_DEP_MAKE_4_0
 # where the build process hangs indefinitely
 config GLIBC_DEP_MAKE_4_3
     def_bool y
-    depends on GLIBC_older_than_2_32 && CONFIGURE_has_make_4_4_or_newer
+    depends on GLIBC_older_than_2_32 && (CONFIGURE_has_make_4_4_or_newer || GLIBC_DEP_MAKE_4_0)
     select COMP_TOOLS_MAKE
     select MAKE_GNUMAKE_SYMLINK
     select MAKE_REQUIRE_older_than_4_4
@@ -197,8 +197,8 @@ config GLIBC_ENABLE_DEBUG
 config GLIBC_EXTRA_CFLAGS
     string
     prompt "extra target CFLAGS"
-    default "-Wno-missing-attributes -Wno-array-bounds -Wno-array-parameter -Wno-stringop-overflow -Wno-maybe-uninitialized" if GLIBC_2_29_or_older && GCC_11_or_later
-    default ""
+    default "-Wno-missing-attributes -Wno-array-bounds -Wno-array-parameter -Wno-stringop-overflow -Wno-maybe-uninitialized" if GLIBC_2_29_or_older && GCC_11_or_later && !GCC_14_or_later
+    default "-Wno-missing-attributes -Wno-array-bounds -Wno-array-parameter -Wno-stringop-overflow -Wno-maybe-uninitialized -Wno-implicit-int" if GLIBC_2_29_or_older && GCC_14_or_later
     help
       Extra target CFLAGS to use when building.
 

diff --git a/toolchain/packages/avr-libc/2.2.1/chksum b/toolchain/packages/avr-libc/2.2.1/chksum
@@ -0,0 +1,4 @@
+md5 avr-libc-2.2.1.tar.bz2 400bef303b53e45e0e30d2a617c60a79
+sha1 avr-libc-2.2.1.tar.bz2 9868b17dc67e5c2e87b9fbbe7232d18947638dc5
+sha256 avr-libc-2.2.1.tar.bz2 006a6306cbbc938c3bdb583ac54f93fe7d7c8cf97f9cde91f91c6fb0273ab465
+sha512 avr-libc-2.2.1.tar.bz2 7746c701e9172584bb8923b941958b7ab7ff323bcf1fe6c46a46e3627f74bb750dcaeab23fbb8ba535c7aa2d56347a9d1b7c64098fda505b24e87e116e71f714
diff --git a/...hain/packages/picolibc/1.8.6/version.desc → ...hain/packages/avr-libc/2.2.1/version.desc b/...hain/packages/picolibc/1.8.6/version.desc → ...hain/packages/avr-libc/2.2.1/version.desc
diff --git a/toolchain/packages/avr-libc/package.desc b/toolchain/packages/avr-libc/package.desc
@@ -1,4 +1,4 @@
 repository='git https://github.com/avrdudes/avr-libc.git'
-mirrors='http://download.savannah.gnu.org/releases/avr-libc'
+mirrors='http://download.savannah.gnu.org/releases/avr-libc https://github.com/avrdudes/avr-libc/releases/download/avr-libc-$(echo ${CT_AVR_LIBC_VERSION} | tr '.' '_')-release'
 archive_formats='.tar.bz2'
 signature_format='packed/.sig'
diff --git a/...n/packages/picolibc/1.8.6/0000-fix-specs_prefix_format-to-point-to-root-toolchain-s.patch b/...n/packages/picolibc/1.8.6/0000-fix-specs_prefix_format-to-point-to-root-toolchain-s.patch
diff --git a/toolchain/packages/picolibc/1.8.6/chksum b/toolchain/packages/picolibc/1.8.6/chksum
diff --git a/toolchain/packages/picolibc/1.8.8/chksum b/toolchain/packages/picolibc/1.8.8/chksum
@@ -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
diff --git a/toolchain/packages/zlib/1.3/version.desc → ...hain/packages/picolibc/1.8.8/version.desc b/toolchain/packages/zlib/1.3/version.desc → ...hain/packages/picolibc/1.8.8/version.desc
diff --git a/toolchain/packages/uClibc-ng/1.0.50/chksum b/toolchain/packages/uClibc-ng/1.0.50/chksum
@@ -0,0 +1,16 @@
+md5 uClibc-ng-1.0.50.tar.xz 22bc49c27947837496a9715e2329a6d6
+sha1 uClibc-ng-1.0.50.tar.xz c258d6a0a93166eae16eebd3768cd697704bab2f
+sha256 uClibc-ng-1.0.50.tar.xz aed867251f4823a74ea5e3a3993d3a7c123280abe15e38dc206770c3968f21cf
+sha512 uClibc-ng-1.0.50.tar.xz a478cbef1160f12a5ff7453f7b6f9c9d8df49c1421b660cb8e9e2a3b792a662ad0793dc9cec7c00490628f46eaadbe9ec578dd8ea86fc27b0069d1f075422612
+md5 uClibc-ng-1.0.50.tar.lz c246355764d3e99b801a77d216f8457b
+sha1 uClibc-ng-1.0.50.tar.lz c209b0db8bb36160218b64dbfd9158d2ba16b357
+sha256 uClibc-ng-1.0.50.tar.lz e338da442fcb6e58c48006e647ec701e0f835fb2b65068f485d08ecf1df992d4
+sha512 uClibc-ng-1.0.50.tar.lz 197ee180177bf589704ac84d2d54db791871735400b6bcb245df309a67d646e42b199627fe0df4d9aeacd76587fe0a90c48563b51a247e8dc9a27fb55f377d89
+md5 uClibc-ng-1.0.50.tar.bz2 6a08f6f6a6006352cfccc16bb800d1da
+sha1 uClibc-ng-1.0.50.tar.bz2 33cce2382d85072db1046e0d132ed10f06f7e2cf
+sha256 uClibc-ng-1.0.50.tar.bz2 b7ac95dd3ac0b293e82e8e1fcb772269dfab9ee623c1b5c15f04f02a7573de78
+sha512 uClibc-ng-1.0.50.tar.bz2 3b909767d1a8e9c216da0220adeeb1681789f4717088416fb4e15357c160f99df711008c6b6efa9849b6347c3d6c56d1d49d11774057ede2b6ee991f0886c12d
+md5 uClibc-ng-1.0.50.tar.gz 067c5acc3ce7b99048776e6b96450ca3
+sha1 uClibc-ng-1.0.50.tar.gz b68c51faf7023e62d5b309e13517fdad0aff8b3b
+sha256 uClibc-ng-1.0.50.tar.gz 7b96bc6d0695ee77370ac49116f1012059de0f37342a68cd437e45d876449664
+sha512 uClibc-ng-1.0.50.tar.gz b7f0cecdd14463a003a4b7c414d87c1bd3dbfd3bdee4ed7141df500012a938ae9d0a286035807a2d2d50728688f4f427e1ba46cdcca08e07996edfa31bdd020c
diff --git a/toolchain/packages/uClibc-ng/1.0.50/version.desc b/toolchain/packages/uClibc-ng/1.0.50/version.desc
diff --git a/toolchain/packages/zlib/1.3.1/chksum b/toolchain/packages/zlib/1.3.1/chksum
@@ -5,4 +5,4 @@ sha512 zlib-1.3.1.tar.xz 1e8e70b362d64a233591906a1f50b59001db04ca14aaffad522198b
 md5 zlib-1.3.1.tar.gz 9855b6d802d7fe5b7bd5b196a2271655
 sha1 zlib-1.3.1.tar.gz f535367b1a11e2f9ac3bec723fb007fbc0d189e5
 sha256 zlib-1.3.1.tar.gz 9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23
-sha512 zlib-1.3.1.tar.gz 580677aad97093829090d4b605ac81c50327e74a6c2de0b85dd2e8525553f3ddde17556ea46f8f007f89e435493c9a20bc997d1ef1c1c2c23274528e3c46b94f
+sha512 zlib-1.3.1.tar.gz 580677aad97093829090d4b605ac81c50327e74a6c2de0b85dd2e8525553f3ddde17556ea46f8f007f89e435493c9a20bc997d1ef1c1c2c23274528e3c46b94f
diff --git a/toolchain/packages/zlib/1.3/chksum b/toolchain/packages/zlib/1.3/chksum
diff --git a/toolchain/samples/mipsel-linux-uclibc-gcc10/crosstool.config b/toolchain/samples/mipsel-linux-uclibc-gcc10/crosstool.config
@@ -25,7 +25,7 @@ CT_LINUX_V_4_4=y
 # CT_KERNEL_LINUX_INSTALL_CHECK is not set
 CT_LIBC_UCLIBC_NG=y
 CT_UCLIBC_NG_SRC_RELEASE=y
-CT_UCLIBC_NG_V_1_0_49=y
+CT_UCLIBC_NG_V_1_0_50=y
 CT_LIBC_UCLIBC_CONFIG_FILE="${CT_TOP_DIR}/../trunk/configs/boards/uclibc-mipsel.config"
 CT_LIBC_UCLIBC_IPV6=y
 CT_LIBC_UCLIBC_WCHAR=y

diff --git a/toolchain/samples/mipsel-linux-uclibc-gcc7/crosstool.config b/toolchain/samples/mipsel-linux-uclibc-gcc7/crosstool.config
@@ -25,7 +25,7 @@ CT_LINUX_V_4_4=y
 # CT_KERNEL_LINUX_INSTALL_CHECK is not set
 CT_LIBC_UCLIBC_NG=y
 CT_UCLIBC_NG_SRC_RELEASE=y
-CT_UCLIBC_NG_V_1_0_49=y
+CT_UCLIBC_NG_V_1_0_50=y
 CT_LIBC_UCLIBC_CONFIG_FILE="${CT_TOP_DIR}/../trunk/configs/boards/uclibc-mipsel.config"
 CT_LIBC_UCLIBC_IPV6=y
 CT_LIBC_UCLIBC_WCHAR=y

diff --git a/toolchain/samples/mipsel-linux-uclibc/crosstool.config b/toolchain/samples/mipsel-linux-uclibc/crosstool.config
@@ -25,7 +25,7 @@ CT_LINUX_V_4_4=y
 # CT_KERNEL_LINUX_INSTALL_CHECK is not set
 CT_LIBC_UCLIBC_NG=y
 CT_UCLIBC_NG_SRC_RELEASE=y
-CT_UCLIBC_NG_V_1_0_49=y
+CT_UCLIBC_NG_V_1_0_50=y
 CT_LIBC_UCLIBC_CONFIG_FILE="${CT_TOP_DIR}/../trunk/configs/boards/uclibc-mipsel.config"
 CT_LIBC_UCLIBC_IPV6=y
 CT_LIBC_UCLIBC_WCHAR=y

diff --git a/toolchain/scripts/build/cc/gcc.sh b/toolchain/scripts/build/cc/gcc.sh
@@ -282,6 +282,7 @@ do_gcc_core_backend() {
         gcc_build|gcc_host)
             CT_DoLog EXTRA "Configuring final gcc compiler"
             extra_config+=( "${CT_CC_SYSROOT_ARG[@]}" )
+            extra_config+=( "--with-headers=${CT_PREFIX_DIR}/${CT_TARGET}/include" )
             extra_user_config=( "${CT_CC_GCC_EXTRA_CONFIG_ARRAY[@]}" )
             log_txt="final gcc compiler"
             # to inhibit the libiberty and libgcc tricks later on

diff --git a/toolchain/scripts/build/debug/300-gdb.sh b/toolchain/scripts/build/debug/300-gdb.sh
@@ -347,7 +347,7 @@ do_gdb_backend()
         "${extra_config[@]}"                        \
 
     if [ "${static}" = "y" ]; then
-        if [ "${GDB_CC_LD_LIBTOOL}" = "y" ]; then
+        if [ "${CT_GDB_CC_LD_LIBTOOL}" = "y" ]; then
             extra_make_flags+=("LDFLAGS=${ldflags} -all-static")
         else
             extra_make_flags+=("LDFLAGS=${ldflags} -static")

diff --git a/toolchain/scripts/crosstool-NG.sh b/toolchain/scripts/crosstool-NG.sh
@@ -361,10 +361,12 @@ if [ -z "${CT_RESTART}" ]; then
         # binutils 2.14 and later obey it, older binutils ignore it.
         # Lets you build a working 32->64 bit cross gcc
         CT_BINUTILS_SYSROOT_ARG="--with-sysroot=${CT_SYSROOT_DIR}"
-        # Use --with-headers, else final gcc will define disable_glibc while
-        # building libgcc, and you'll have no profiling
         CT_CC_CORE_SYSROOT_ARG=("--without-headers")
-        CT_CC_SYSROOT_ARG=("--with-headers=${CT_HEADERS_DIR}")
+        if [ "${CT_LIBC_GLIBC}" = "y" ]; then
+            # Use --with-headers, else final gcc will define disable_glibc while
+            # building libgcc, and you'll have no profiling
+            CT_CC_SYSROOT_ARG=("--with-headers=${CT_HEADERS_DIR}")
+        fi
     fi
     CT_DoExecLog ALL mkdir -p "${CT_SYSROOT_DIR}"
     CT_DoExecLog ALL mkdir -p "${CT_DEBUGROOT_DIR}"

diff --git a/trunk/configs/boards/uclibc-mipsel.config b/trunk/configs/boards/uclibc-mipsel.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# uClibc-ng 1.0.49 C Library Configuration
+# uClibc-ng 1.0.50 C Library Configuration
 #
 # TARGET_aarch64 is not set
 # TARGET_alpha is not set

diff --git a/trunk/libs/libcurl/Makefile b/trunk/libs/libcurl/Makefile
@@ -1,11 +1,11 @@
 include $(ROOTDIR)/rules.mk
 
 PKG_NAME:=curl
-PKG_VERSION:=8.9.1
+PKG_VERSION:=8.10.1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/curl/curl/releases/download/curl-$(subst .,_,$(PKG_VERSION))/
-PKG_HASH:=f292f6cc051d5bbabf725ef85d432dfeacc8711dd717ea97612ae590643801e5
+PKG_HASH:=73a4b0e99596a09fa5924a4fb7e4b995a85fda0d18a2c02ab9cf134bebce04ee
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -27,6 +27,7 @@ CONFIGURE_ARGS += \
 	--disable-dict \
 	--disable-ares \
 	--disable-debug \
+	--disable-docs \
 	--disable-curldebug \
 	--disable-manual \
 	--disable-verbose \
@@ -39,6 +40,7 @@ CONFIGURE_ARGS += \
 	--without-krb4 \
 	--without-nss \
 	--without-ca-path \
+	--without-libpsl \
 	--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \
 	--with-random=/dev/urandom \
 	--with-zlib=$(STAGING_DIR) \

diff --git a/trunk/libs/libcurl/patches/200-no_docs_tests.patch b/trunk/libs/libcurl/patches/200-no_docs_tests.patch
@@ -1,15 +1,15 @@
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -87,7 +87,7 @@ CLEANFILES = $(VC14_LIBVCXPROJ) $(VC14_S
+@@ -94,7 +94,7 @@ CLEANFILES = $(VC14_LIBVCXPROJ) $(VC14_S
  bin_SCRIPTS = curl-config
 
  SUBDIRS = lib docs src scripts
--DIST_SUBDIRS = $(SUBDIRS) tests packages scripts include docs
+-DIST_SUBDIRS = $(SUBDIRS) tests packages include docs
 +DIST_SUBDIRS = $(SUBDIRS) packages include
 
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = libcurl.pc
-@@ -196,12 +196,9 @@ cygwinbin:
+@@ -203,12 +203,9 @@ cygwinbin:
  if BUILD_DOCS
  install-data-hook:
  	(cd include && $(MAKE) install)

diff --git a/trunk/libs/libssl/Makefile b/trunk/libs/libssl/Makefile
@@ -1,11 +1,11 @@
 include $(ROOTDIR)/rules.mk
 
 PKG_NAME:=openssl
-PKG_VERSION:=1.1.1w
+PKG_VERSION:=3.0.15
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.openssl.org/source/
-PKG_HASH:=cf3098950cb4d853ad95c0841f1f9c6d3dc102dccfcacd521d93925208b76ac8
+PKG_HASH:=23c666d0edf20f14249b3d8f0368acaee9ab585b09e1de82107c66e1f3ec9533
 
 include $(INCLUDE_DIR)/package.mk