OpenWrt/xiaomi-ax3600
1
0
Fork 0
mirror of https://github.com/immortalwrt/immortalwrt.git synced 2025-08-07 22:06:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge Official Source

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen
2025-07-30 15:11:03 +08:00
parent 14fc614405 d6200f2502
commit c16805f827
4 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
toolchain/glibc/common.mk
View File

@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=glibc PKG_NAME:=glibc
PKG_VERSION:=2.41 PKG_VERSION:=2.41
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_VERSION:=6e489c17f827317bcf8544efefa65f13b5a079dc PKG_SOURCE_VERSION:=e7c419a2957590fb657900fc92a89708f41abd9d
PKG_MIRROR_HASH:=37527af9a3cbc41201b8a8bead3e6ec973e922e11639ff1762de50c46cf4913e PKG_MIRROR_HASH:=8613b8765c8651888178623355bb019538a1e1e32d9cc5a83ab7f063054748e1
PKG_SOURCE_URL:=https://sourceware.org/git/glibc.git PKG_SOURCE_URL:=https://sourceware.org/git/glibc.git
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
PKG_CPE_ID:=cpe:/a:gnu:glibc PKG_CPE_ID:=cpe:/a:gnu:glibc

6
tools/automake/patches/310-maintainer-clean-built_sources.patch
View File

@ -21,7 +21,7 @@
+ if (! grep { $_ eq '$(BUILT_SOURCES)' } $mcleanvar->value_as_list ($rcond)) { + if (! grep { $_ eq '$(BUILT_SOURCES)' } $mcleanvar->value_as_list ($rcond)) {
+ Automake::Variable::define ($mcleanvar->name, VAR_MAKEFILE, '+', $rcond, + Automake::Variable::define ($mcleanvar->name, VAR_MAKEFILE, '+', $rcond,
+ '$(BUILT_SOURCES)', '', INTERNAL, VAR_ASIS) + '$(BUILT_SOURCES)', '', INTERNAL, VAR_ASIS)
+ if vardef ('BUILT_SOURCES', $rcond); + if var ('BUILT_SOURCES');
+ } + }
+ } + }
+ my $bsources = var ('BUILT_SOURCES'); + my $bsources = var ('BUILT_SOURCES');
@ -30,9 +30,9 @@
+ { + {
+ Automake::Variable::define ($mcleanvar->name, VAR_MAKEFILE, '', $rcond, + Automake::Variable::define ($mcleanvar->name, VAR_MAKEFILE, '', $rcond,
+ '$(BUILT_SOURCES)', '', INTERNAL, VAR_ASIS) + '$(BUILT_SOURCES)', '', INTERNAL, VAR_ASIS)
+ if ! vardef ($mcleanvar, $rcond); + if ! ($mcleanvar->def ($rcond) || $mcleanvar->def (TRUE));
+ } + }
+ if (! vardef ($mcleanvar, TRUE)) { + if (! $mcleanvar->def (TRUE)) {
+ Automake::Variable::define ($mcleanvar->name, VAR_MAKEFILE, '', TRUE, + Automake::Variable::define ($mcleanvar->name, VAR_MAKEFILE, '', TRUE,
+ '$(BUILT_SOURCES)', '', INTERNAL, VAR_ASIS); + '$(BUILT_SOURCES)', '', INTERNAL, VAR_ASIS);
+ } + }

1
tools/expat/Makefile
View File

@ -20,6 +20,7 @@ HOST_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
HOSTCC := $(HOSTCC_NOCACHE) HOSTCC := $(HOSTCC_NOCACHE)
HOSTCXX := $(HOSTCXX_NOCACHE)
HOST_CONFIGURE_ARGS += \ HOST_CONFIGURE_ARGS += \
--disable-shared \ --disable-shared \

28
tools/util-linux/patches/110-move-libpthread-to-libs.patch Normal file
View File

@ -0,0 +1,28 @@
From 15bc69131a1e08019096251ea848104e57d99a12 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Sun, 27 Jul 2025 11:55:56 -0700
Subject: [PATCH] move libpthread to Libs
OpewWrt uses static host libraries and as such dependant libraries must
be moved to public Libs. meson handles this automatically but Autotools
does not.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
libuuid/uuid.pc.in | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/libuuid/uuid.pc.in b/libuuid/uuid.pc.in
index 51929fe80d72..9fe908b61f12 100644
--- a/libuuid/uuid.pc.in
+++ b/libuuid/uuid.pc.in
@@ -7,5 +7,4 @@ Name: uuid
Description: Universally unique id library
Version: @LIBUUID_VERSION@
Cflags: -I${includedir}/uuid
-Libs.private: @SOCKET_LIBS@ -lpthread
-Libs: -L${libdir} -luuid
+Libs: -L${libdir} -luuid @SOCKET_LIBS@ -lpthread
--
2.50.1