mirror of
https://github.com/FUjr/gl-infra-builder.git
synced 2025-12-16 17:15:08 +00:00
15eee0e27c
``` python3 setup.py -c configs/config-mt798x.yml cd mt798x ./scripts/gen_config.py target_mt7986_gl-mt6000 glinet_mt7986_wifi glinet_mt6000 make -j $(nproc) ``` Signed-off-by: Jianhui Zhao <jianhui.zhao@gl-inet.com>
98 lines
3.8 KiB
Diff
98 lines
3.8 KiB
Diff
From bbd364177aa665041c09302c45a7d3a7ff4903a3 Mon Sep 17 00:00:00 2001
|
|
From: lincolnzh <hongjian.zhang@gl-inet.com>
|
|
Date: Mon, 17 Oct 2022 10:09:42 +0800
|
|
Subject: [PATCH] package/uclibc++: Fix the compilation error caused by the long road
|
|
|
|
---
|
|
...-buildsys-shorten-abi-deb-file-names.patch | 52 ++++++-------------
|
|
1 file changed, 15 insertions(+), 37 deletions(-)
|
|
|
|
diff --git a/package/libs/uclibc++/patches/006-buildsys-shorten-abi-deb-file-names.patch b/package/libs/uclibc++/patches/006-buildsys-shorten-abi-deb-file-names.patch
|
|
index 8a4677c709..5a4327fc2f 100644
|
|
--- a/package/libs/uclibc++/patches/006-buildsys-shorten-abi-deb-file-names.patch
|
|
+++ b/package/libs/uclibc++/patches/006-buildsys-shorten-abi-deb-file-names.patch
|
|
@@ -1,27 +1,7 @@
|
|
-From 6687fc9276fa52defaf8592f2001c19b826aec93 Mon Sep 17 00:00:00 2001
|
|
-From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
|
|
-Date: Thu, 4 Jun 2020 10:21:43 +0200
|
|
-Subject: buildsys: shorten abi dep-file names
|
|
-
|
|
-certain crypto-layers encode required information in the
|
|
-filename hence crippling NAME_MAX from 255 down to about 143
|
|
-ascii chars.
|
|
-
|
|
-Since the dependency files of libgcc_eh and libsupc encode the full
|
|
-path to the corresponding libraries, the names of the dep files can
|
|
-get quite large. Shorten them by some (arbitrary, short) hash.
|
|
-
|
|
-Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
|
|
----
|
|
- Rules.mak | 2 ++
|
|
- src/abi/libgcc_eh/Makefile.in | 4 ++--
|
|
- src/abi/libsupc/Makefile.in | 4 ++--
|
|
- 3 files changed, 6 insertions(+), 4 deletions(-)
|
|
-
|
|
-diff --git a/Rules.mak b/Rules.mak
|
|
-index 1b5ed30..9162c64 100644
|
|
---- a/Rules.mak
|
|
-+++ b/Rules.mak
|
|
+Index: uClibc++-0.2.5/Rules.mak
|
|
+===================================================================
|
|
+--- uClibc++-0.2.5.orig/Rules.mak
|
|
++++ uClibc++-0.2.5/Rules.mak
|
|
@@ -50,6 +50,7 @@ RM = rm -f
|
|
TAR = tar
|
|
SED = sed
|
|
@@ -30,7 +10,7 @@ index 1b5ed30..9162c64 100644
|
|
|
|
ARFLAGS:= cr
|
|
|
|
-@@ -249,6 +250,7 @@ endif
|
|
+@@ -247,6 +248,7 @@ endif
|
|
|
|
list-archive-members = $(if $(1),$(shell $(AR) t $(1)))
|
|
variablify = $(strip $(subst /,_,$(subst :,_,$(subst ;,_,$(subst |,_,$(subst >,_,$(subst <,_,$(1))))))))
|
|
@@ -38,11 +18,11 @@ index 1b5ed30..9162c64 100644
|
|
|
|
GEN_LIBS:= -lc
|
|
ifneq ($(LIBGCC_DIR),$(UCLIBCXX_RUNTIME_LIBDIR))
|
|
-diff --git a/src/abi/libgcc_eh/Makefile.in b/src/abi/libgcc_eh/Makefile.in
|
|
-index 46b0017..1553b34 100644
|
|
---- a/src/abi/libgcc_eh/Makefile.in
|
|
-+++ b/src/abi/libgcc_eh/Makefile.in
|
|
-@@ -4,7 +4,7 @@ OBJS = $(call list-archive-members,$(LIBGCC_EH))
|
|
+Index: uClibc++-0.2.5/src/abi/libgcc_eh/Makefile.in
|
|
+===================================================================
|
|
+--- uClibc++-0.2.5.orig/src/abi/libgcc_eh/Makefile.in
|
|
++++ uClibc++-0.2.5/src/abi/libgcc_eh/Makefile.in
|
|
+@@ -4,7 +4,7 @@ OBJS = $(call list-archive-members,$(LIB
|
|
libgcc_eh-$(IMPORT_LIBGCC_EH) := $(OBJS)
|
|
|
|
LIBGCC_EH_VAR := $(call variablify,$(LIBGCC_EH))
|
|
@@ -60,11 +40,11 @@ index 46b0017..1553b34 100644
|
|
|
|
CLEAN_src/abi/libgcc_eh: ;
|
|
DISTCLEAN_src/abi/libgcc_eh:
|
|
-diff --git a/src/abi/libsupc/Makefile.in b/src/abi/libsupc/Makefile.in
|
|
-index 89e0e8a..9c00df0 100644
|
|
---- a/src/abi/libsupc/Makefile.in
|
|
-+++ b/src/abi/libsupc/Makefile.in
|
|
-@@ -5,7 +5,7 @@ OBJS-OMIT = $(filter new_op%.o del_op%.o pure.o new_handler.o eh_alloc.o eh_glob
|
|
+Index: uClibc++-0.2.5/src/abi/libsupc/Makefile.in
|
|
+===================================================================
|
|
+--- uClibc++-0.2.5.orig/src/abi/libsupc/Makefile.in
|
|
++++ uClibc++-0.2.5/src/abi/libsupc/Makefile.in
|
|
+@@ -5,7 +5,7 @@ OBJS-OMIT = $(filter new_op%.o del_op%.o
|
|
libsupc-$(IMPORT_LIBSUP) := $(filter-out $(OBJS-OMIT),$(OBJS))
|
|
|
|
LIBSUP_VAR := $(call variablify,$(LIBSUP))
|
|
@@ -82,5 +62,3 @@ index 89e0e8a..9c00df0 100644
|
|
|
|
CLEAN_src/abi/libsupc: ;
|
|
DISTCLEAN_src/abi/libsupc:
|
|
---
|
|
-cgit v1.2.3
|
|
--
|
|
2.17.1
|
|
|