mirror of
https://github.com/immortalwrt/immortalwrt.git
synced 2025-08-11 06:11:53 +08:00
Merge Official Source
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
@ -11,9 +11,9 @@ PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL=$(PROJECT_GIT)/project/firmware-utils.git
|
||||
PKG_SOURCE_DATE:=2025-07-24
|
||||
PKG_SOURCE_VERSION:=f29de74ecd7d952ee1f9a20577fec9f37c0d6f4a
|
||||
PKG_MIRROR_HASH:=6abf06a2243acb1a9820a8c4d7c9a1f03f5b920fecf86ac2353d257e7963f7bb
|
||||
PKG_SOURCE_DATE:=2025-08-03
|
||||
PKG_SOURCE_VERSION:=950f83405a935395492d61c9972b5e5ca826eeee
|
||||
PKG_MIRROR_HASH:=19f5b7547dc6f9460e25183c83d55aca9d1f18148466c09b64504a64379a34ae
|
||||
|
||||
include $(INCLUDE_DIR)/host-build.mk
|
||||
include $(INCLUDE_DIR)/cmake.mk
|
||||
|
59
tools/gnulib/patches/190-stdc-m4-no-cache.patch
Normal file
59
tools/gnulib/patches/190-stdc-m4-no-cache.patch
Normal file
@ -0,0 +1,59 @@
|
||||
--- a/m4/std-gnu11.m4
|
||||
+++ b/m4/std-gnu11.m4
|
||||
@@ -185,8 +185,7 @@ AC_LANG_POP(C++)dnl
|
||||
# else ACTION-IF-UNAVAILABLE.
|
||||
AC_DEFUN([_AC_C_STD_TRY],
|
||||
[AC_MSG_CHECKING([for $CC option to enable ]m4_translit($1, [c], [C])[ features])
|
||||
-AC_CACHE_VAL(ac_cv_prog_cc_$1,
|
||||
-[ac_cv_prog_cc_$1=no
|
||||
+ac_cv_prog_cc_$1=no
|
||||
ac_save_CC=$CC
|
||||
AC_LANG_CONFTEST([AC_LANG_PROGRAM([$2], [$3])])
|
||||
for ac_arg in '' $4
|
||||
@@ -197,7 +196,6 @@ do
|
||||
done
|
||||
rm -f conftest.$ac_ext
|
||||
CC=$ac_save_CC
|
||||
-])# AC_CACHE_VAL
|
||||
ac_prog_cc_stdc_options=
|
||||
case "x$ac_cv_prog_cc_$1" in
|
||||
x)
|
||||
@@ -523,8 +521,7 @@ fi
|
||||
AC_DEFUN([_AC_CXX_STD_TRY],
|
||||
[AC_MSG_CHECKING([for $CXX option to enable ]m4_translit(m4_translit($1, [x], [+]), [a-z], [A-Z])[ features])
|
||||
AC_LANG_PUSH(C++)dnl
|
||||
-AC_CACHE_VAL(ac_cv_prog_cxx_$1,
|
||||
-[ac_cv_prog_cxx_$1=no
|
||||
+ac_cv_prog_cxx_$1=no
|
||||
ac_save_CXX=$CXX
|
||||
AC_LANG_CONFTEST([AC_LANG_PROGRAM([$2], [$3])])
|
||||
for ac_arg in '' $4
|
||||
@@ -535,7 +532,6 @@ do
|
||||
done
|
||||
rm -f conftest.$ac_ext
|
||||
CXX=$ac_save_CXX
|
||||
-])# AC_CACHE_VAL
|
||||
ac_prog_cxx_stdcxx_options=
|
||||
case "x$ac_cv_prog_cxx_$1" in
|
||||
x)
|
||||
--- a/m4/std-gnu23.m4
|
||||
+++ b/m4/std-gnu23.m4
|
||||
@@ -696,8 +696,7 @@ AC_DEFUN([_AC_PROG_CC_STDC_EDITION_TRY],
|
||||
[AC_REQUIRE([_AC_C_C$1_TEST_PROGRAM])]dnl
|
||||
[AS_IF([test x$ac_prog_cc_stdc = xno],
|
||||
[AC_MSG_CHECKING([for $CC option to enable C$1 features])
|
||||
-AC_CACHE_VAL([ac_cv_prog_cc_c$1],
|
||||
-[ac_cv_prog_cc_c$1=no
|
||||
+ac_cv_prog_cc_c$1=no
|
||||
ac_save_CC=$CC
|
||||
AC_LANG_CONFTEST([AC_LANG_DEFINES_PROVIDED][$][ac_c_conftest_c$1_program])
|
||||
for ac_arg in '' m4_normalize(m4_defn([_AC_C_C$1_OPTIONS]))
|
||||
@@ -707,7 +706,7 @@ do
|
||||
test "x$ac_cv_prog_cc_c$1" != "xno" && break
|
||||
done
|
||||
rm -f conftest.$ac_ext
|
||||
-CC=$ac_save_CC])
|
||||
+CC=$ac_save_CC
|
||||
AS_IF([test "x$ac_cv_prog_cc_c$1" = xno],
|
||||
[AC_MSG_RESULT([unsupported])],
|
||||
[AS_IF([test "x$ac_cv_prog_cc_c$1" = x],
|
Reference in New Issue
Block a user