* [PATCH 1/7] ffmpeg: Fix build with binutils 2.41
@ 2023-08-15 17:02 Michael Tremer
2023-08-15 17:02 ` [PATCH 2/7] ipfire-netboot: " Michael Tremer
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Michael Tremer @ 2023-08-15 17:02 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 3454 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/ffmpeg | 2 +-
...hpops-clip-constants-used-with-shift.patch | 76 +++++++++++++++++++
2 files changed, 77 insertions(+), 1 deletion(-)
create mode 100644 src/patches/ffmpeg-6.0-mathpops-clip-constants-used-with-shift.patch
diff --git a/lfs/ffmpeg b/lfs/ffmpeg
index d989846d5..836c4dd37 100644
--- a/lfs/ffmpeg
+++ b/lfs/ffmpeg
@@ -85,7 +85,7 @@ $(subst %,%_BLAKE2,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ffmpeg-6.0-mathpops-clip-constants-used-with-shift.patch
cd $(DIR_APP) && \
CFLAGS="$(CFLAGS)" \
LDFLAGS="$(LDFLAGS)" \
diff --git a/src/patches/ffmpeg-6.0-mathpops-clip-constants-used-with-shift.patch b/src/patches/ffmpeg-6.0-mathpops-clip-constants-used-with-shift.patch
new file mode 100644
index 000000000..52a931002
--- /dev/null
+++ b/src/patches/ffmpeg-6.0-mathpops-clip-constants-used-with-shift.patch
@@ -0,0 +1,76 @@
+From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001
+From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <remi(a)remlab.net>
+Date: Sun, 16 Jul 2023 18:18:02 +0300
+Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift
+ instructions within inline assembly
+
+Fixes assembling with binutil as >= 2.41
+
+Signed-off-by: James Almer <jamrial(a)gmail.com>
+---
+ libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++---
+ 1 file changed, 23 insertions(+), 3 deletions(-)
+
+diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
+index 6298f5ed19..ca7e2dffc1 100644
+--- a/libavcodec/x86/mathops.h
++++ b/libavcodec/x86/mathops.h
+@@ -35,12 +35,20 @@
+ static av_always_inline av_const int MULL(int a, int b, unsigned shift)
+ {
+ int rt, dummy;
++ if (__builtin_constant_p(shift))
+ __asm__ (
+ "imull %3 \n\t"
+ "shrdl %4, %%edx, %%eax \n\t"
+ :"=a"(rt), "=d"(dummy)
+- :"a"(a), "rm"(b), "ci"((uint8_t)shift)
++ :"a"(a), "rm"(b), "i"(shift & 0x1F)
+ );
++ else
++ __asm__ (
++ "imull %3 \n\t"
++ "shrdl %4, %%edx, %%eax \n\t"
++ :"=a"(rt), "=d"(dummy)
++ :"a"(a), "rm"(b), "c"((uint8_t)shift)
++ );
+ return rt;
+ }
+
+@@ -113,19 +121,31 @@ __asm__ volatile(\
+ // avoid +32 for shift optimization (gcc should do that ...)
+ #define NEG_SSR32 NEG_SSR32
+ static inline int32_t NEG_SSR32( int32_t a, int8_t s){
++ if (__builtin_constant_p(s))
+ __asm__ ("sarl %1, %0\n\t"
+ : "+r" (a)
+- : "ic" ((uint8_t)(-s))
++ : "i" (-s & 0x1F)
+ );
++ else
++ __asm__ ("sarl %1, %0\n\t"
++ : "+r" (a)
++ : "c" ((uint8_t)(-s))
++ );
+ return a;
+ }
+
+ #define NEG_USR32 NEG_USR32
+ static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
++ if (__builtin_constant_p(s))
+ __asm__ ("shrl %1, %0\n\t"
+ : "+r" (a)
+- : "ic" ((uint8_t)(-s))
++ : "i" (-s & 0x1F)
+ );
++ else
++ __asm__ ("shrl %1, %0\n\t"
++ : "+r" (a)
++ : "c" ((uint8_t)(-s))
++ );
+ return a;
+ }
+
+--
+2.25.1
+
--
2.39.2
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/7] ipfire-netboot: Fix build with binutils 2.41
2023-08-15 17:02 [PATCH 1/7] ffmpeg: Fix build with binutils 2.41 Michael Tremer
@ 2023-08-15 17:02 ` Michael Tremer
2023-08-15 17:02 ` [PATCH 3/7] binutils: Update to 2.41 Michael Tremer
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Michael Tremer @ 2023-08-15 17:02 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 3233 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/ipfire-netboot | 1 +
...se-the-right-sized-register-for-push.patch | 44 +++++++++++++++++++
2 files changed, 45 insertions(+)
create mode 100644 src/patches/ipxe-use-the-right-sized-register-for-push.patch
diff --git a/lfs/ipfire-netboot b/lfs/ipfire-netboot
index 1fd37e9eb..e7ba44af9 100644
--- a/lfs/ipfire-netboot
+++ b/lfs/ipfire-netboot
@@ -80,6 +80,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP)/ipxe-$(PXE_VER) && patch -Np1 < $(DIR_SRC)/src/patches/ipxe-fix-stringop-truncation-warning-with-gcc-8-x.patch
cd $(DIR_APP)/ipxe-$(PXE_VER) && patch -Np1 < $(DIR_SRC)/src/patches/ipxe-handle-R_X86_64_PLT32.patch
cd $(DIR_APP)/ipxe-$(PXE_VER) && patch -Np1 < $(DIR_SRC)/src/patches/ipxe-1b67a05-be-explicit-about-fcommon-compiler-directive.patch
+ cd $(DIR_APP)/ipxe-$(PXE_VER) && patch -Np1 < $(DIR_SRC)/src/patches/ipxe-use-the-right-sized-register-for-push.patch
cd $(DIR_APP) && rm -rfv ipxe && ln -s ipxe-$(PXE_VER) ipxe
cd $(DIR_APP) && make $(MAKETUNING) bin/ipxe.lkrn
ifeq "$(BUILD_ARCH)" "x86_64"
diff --git a/src/patches/ipxe-use-the-right-sized-register-for-push.patch b/src/patches/ipxe-use-the-right-sized-register-for-push.patch
new file mode 100644
index 000000000..99b76de66
--- /dev/null
+++ b/src/patches/ipxe-use-the-right-sized-register-for-push.patch
@@ -0,0 +1,44 @@
+From 08caa8be3a143d6f33782f398b7937efb39ff283 Mon Sep 17 00:00:00 2001
+From: Justin Cano <5184128+jstncno(a)users.noreply.github.com>
+Date: Thu, 3 Aug 2023 09:58:11 -0700
+Subject: [PATCH] Use the right sized register for the push operand based on
+ the size of the value being pushed
+
+Fixes https://github.com/ipxe/ipxe/issues/997
+---
+ src/arch/x86/include/librm.h | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/arch/x86/include/librm.h b/src/arch/x86/include/librm.h
+index 5196d390fa..d9e748adfc 100644
+--- a/src/arch/x86/include/librm.h
++++ b/src/arch/x86/include/librm.h
+@@ -250,8 +250,10 @@ extern void remove_user_from_rm_stack ( userptr_t data, size_t size );
+ /* CODE_DEFAULT: restore default .code32/.code64 directive */
+ #ifdef __x86_64__
+ #define CODE_DEFAULT ".code64"
++#define PUSH "pushq"
+ #else
+ #define CODE_DEFAULT ".code32"
++#define PUSH "pushl"
+ #endif
+
+ /* LINE_SYMBOL: declare a symbol for the current source code line */
+@@ -268,7 +270,7 @@ extern void remove_user_from_rm_stack ( userptr_t data, size_t size );
+
+ /* REAL_CODE: declare a fragment of code that executes in real mode */
+ #define REAL_CODE( asm_code_str ) \
+- "push $1f\n\t" \
++ PUSH " $1f\n\t" \
+ "call real_call\n\t" \
+ TEXT16_CODE ( "\n1:\n\t" \
+ asm_code_str \
+@@ -277,7 +279,7 @@ extern void remove_user_from_rm_stack ( userptr_t data, size_t size );
+
+ /* PHYS_CODE: declare a fragment of code that executes in flat physical mode */
+ #define PHYS_CODE( asm_code_str ) \
+- "push $1f\n\t" \
++ PUSH " $1f\n\t" \
+ "call phys_call\n\t" \
+ ".section \".text.phys\", \"ax\", @progbits\n\t"\
+ "\n" LINE_SYMBOL "\n\t" \
--
2.39.2
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 3/7] binutils: Update to 2.41
2023-08-15 17:02 [PATCH 1/7] ffmpeg: Fix build with binutils 2.41 Michael Tremer
2023-08-15 17:02 ` [PATCH 2/7] ipfire-netboot: " Michael Tremer
@ 2023-08-15 17:02 ` Michael Tremer
2023-08-15 17:02 ` [PATCH 5/7] binutils: Disable building gprof-ng in toolchain Michael Tremer
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Michael Tremer @ 2023-08-15 17:02 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 8172 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
config/rootfiles/common/aarch64/binutils | 24 +++++++++++++-----------
config/rootfiles/common/riscv64/binutils | 14 +++++++-------
config/rootfiles/common/x86_64/binutils | 22 +++++++++++++---------
lfs/binutils | 4 ++--
4 files changed, 35 insertions(+), 29 deletions(-)
diff --git a/config/rootfiles/common/aarch64/binutils b/config/rootfiles/common/aarch64/binutils
index 9106f5502..64bf0db7a 100644
--- a/config/rootfiles/common/aarch64/binutils
+++ b/config/rootfiles/common/aarch64/binutils
@@ -41,13 +41,12 @@ usr/bin/strings
usr/lib/bfd-plugins/libdep.so
#usr/lib/gprofng
#usr/lib/gprofng/libgp-collector.so
+#usr/lib/gprofng/libgp-collectorAPI.a
+#usr/lib/gprofng/libgp-collectorAPI.la
#usr/lib/gprofng/libgp-collectorAPI.so
#usr/lib/gprofng/libgp-heap.so
#usr/lib/gprofng/libgp-iotrace.so
#usr/lib/gprofng/libgp-sync.so
-#usr/lib/gprofng/libgprofng.so
-#usr/lib/gprofng/libgprofng.so.0
-#usr/lib/gprofng/libgprofng.so.0.0.0
#usr/lib/ldscripts
#usr/lib/ldscripts/aarch64elf.x
#usr/lib/ldscripts/aarch64elf.xbn
@@ -313,7 +312,7 @@ usr/lib/bfd-plugins/libdep.so
#usr/lib/ldscripts/armelfb_linux_eabi.xu
#usr/lib/ldscripts/armelfb_linux_eabi.xw
#usr/lib/ldscripts/armelfb_linux_eabi.xwe
-usr/lib/libbfd-2.40.so
+usr/lib/libbfd-2.41.so
#usr/lib/libbfd.a
#usr/lib/libbfd.la
#usr/lib/libbfd.so
@@ -327,15 +326,20 @@ usr/lib/libctf-nobfd.so.0.0.0
#usr/lib/libctf.so
usr/lib/libctf.so.0
usr/lib/libctf.so.0.0.0
-usr/lib/libopcodes-2.40.so
+#usr/lib/libgprofng.a
+#usr/lib/libgprofng.la
+#usr/lib/libgprofng.so
+usr/lib/libgprofng.so.0
+usr/lib/libgprofng.so.0.0.0
+usr/lib/libopcodes-2.41.so
#usr/lib/libopcodes.a
#usr/lib/libopcodes.la
#usr/lib/libopcodes.so
#usr/lib/libsframe.a
#usr/lib/libsframe.la
#usr/lib/libsframe.so
-usr/lib/libsframe.so.0
-usr/lib/libsframe.so.0.0.0
+usr/lib/libsframe.so.1
+usr/lib/libsframe.so.1.0.0
#usr/share/info/as.info
#usr/share/info/bfd.info
#usr/share/info/binutils.info
@@ -343,6 +347,7 @@ usr/lib/libsframe.so.0.0.0
#usr/share/info/gprof.info
#usr/share/info/gprofng.info
#usr/share/info/ld.info
+#usr/share/info/ldint.info
#usr/share/info/sframe-spec.info
#usr/share/locale/bg/LC_MESSAGES/binutils.mo
#usr/share/locale/bg/LC_MESSAGES/gprof.mo
@@ -398,8 +403,7 @@ usr/lib/libsframe.so.0.0.0
#usr/share/locale/ja/LC_MESSAGES/gas.mo
#usr/share/locale/ja/LC_MESSAGES/gprof.mo
#usr/share/locale/ja/LC_MESSAGES/ld.mo
-#usr/share/locale/ka
-#usr/share/locale/ka/LC_MESSAGES
+#usr/share/locale/ka/LC_MESSAGES/bfd.mo
#usr/share/locale/ka/LC_MESSAGES/gprof.mo
#usr/share/locale/ms
#usr/share/locale/ms/LC_MESSAGES
@@ -411,8 +415,6 @@ usr/lib/libsframe.so.0.0.0
#usr/share/locale/pt_BR/LC_MESSAGES/gprof.mo
#usr/share/locale/pt_BR/LC_MESSAGES/ld.mo
#usr/share/locale/pt_BR/LC_MESSAGES/opcodes.mo
-#usr/share/locale/ro
-#usr/share/locale/ro/LC_MESSAGES
#usr/share/locale/ro/LC_MESSAGES/bfd.mo
#usr/share/locale/ro/LC_MESSAGES/binutils.mo
#usr/share/locale/ro/LC_MESSAGES/gprof.mo
diff --git a/config/rootfiles/common/riscv64/binutils b/config/rootfiles/common/riscv64/binutils
index bf7df7eca..6ecd90ac2 100644
--- a/config/rootfiles/common/riscv64/binutils
+++ b/config/rootfiles/common/riscv64/binutils
@@ -293,7 +293,7 @@ usr/bin/strings
#usr/lib/ldscripts/elf64lriscv_lp64f.xu
#usr/lib/ldscripts/elf64lriscv_lp64f.xw
#usr/lib/ldscripts/elf64lriscv_lp64f.xwe
-usr/lib/libbfd-2.40.so
+usr/lib/libbfd-2.41.so
#usr/lib/libbfd.a
#usr/lib/libbfd.la
#usr/lib/libbfd.so
@@ -307,21 +307,22 @@ usr/lib/libctf-nobfd.so.0.0.0
#usr/lib/libctf.so
usr/lib/libctf.so.0
usr/lib/libctf.so.0.0.0
-usr/lib/libopcodes-2.40.so
+usr/lib/libopcodes-2.41.so
#usr/lib/libopcodes.a
#usr/lib/libopcodes.la
#usr/lib/libopcodes.so
#usr/lib/libsframe.a
#usr/lib/libsframe.la
-usr/lib/libsframe.so
-#usr/lib/libsframe.so.0
-usr/lib/libsframe.so.0.0.0
+#usr/lib/libsframe.so
+usr/lib/libsframe.so.1
+usr/lib/libsframe.so.1.0.0
#usr/share/info/as.info
#usr/share/info/bfd.info
#usr/share/info/binutils.info
#usr/share/info/ctf-spec.info
#usr/share/info/gprof.info
#usr/share/info/ld.info
+#usr/share/info/ldint.info
#usr/share/info/sframe-spec.info
#usr/share/locale/bg/LC_MESSAGES/binutils.mo
#usr/share/locale/bg/LC_MESSAGES/gprof.mo
@@ -377,6 +378,7 @@ usr/lib/libsframe.so.0.0.0
#usr/share/locale/ja/LC_MESSAGES/gas.mo
#usr/share/locale/ja/LC_MESSAGES/gprof.mo
#usr/share/locale/ja/LC_MESSAGES/ld.mo
+#usr/share/locale/ka/LC_MESSAGES/bfd.mo
#usr/share/locale/ka/LC_MESSAGES/gprof.mo
#usr/share/locale/ms
#usr/share/locale/ms/LC_MESSAGES
@@ -388,8 +390,6 @@ usr/lib/libsframe.so.0.0.0
#usr/share/locale/pt_BR/LC_MESSAGES/gprof.mo
#usr/share/locale/pt_BR/LC_MESSAGES/ld.mo
#usr/share/locale/pt_BR/LC_MESSAGES/opcodes.mo
-#usr/share/locale/ro
-#usr/share/locale/ro/LC_MESSAGES
#usr/share/locale/ro/LC_MESSAGES/bfd.mo
#usr/share/locale/ro/LC_MESSAGES/binutils.mo
#usr/share/locale/ro/LC_MESSAGES/gprof.mo
diff --git a/config/rootfiles/common/x86_64/binutils b/config/rootfiles/common/x86_64/binutils
index 783433e20..b38eb4a43 100644
--- a/config/rootfiles/common/x86_64/binutils
+++ b/config/rootfiles/common/x86_64/binutils
@@ -41,13 +41,12 @@ usr/bin/strings
#usr/lib/bfd-plugins/libdep.so
#usr/lib/gprofng
#usr/lib/gprofng/libgp-collector.so
+#usr/lib/gprofng/libgp-collectorAPI.a
+#usr/lib/gprofng/libgp-collectorAPI.la
#usr/lib/gprofng/libgp-collectorAPI.so
#usr/lib/gprofng/libgp-heap.so
#usr/lib/gprofng/libgp-iotrace.so
#usr/lib/gprofng/libgp-sync.so
-#usr/lib/gprofng/libgprofng.so
-#usr/lib/gprofng/libgprofng.so.0
-#usr/lib/gprofng/libgprofng.so.0.0.0
#usr/lib/ldscripts
#usr/lib/ldscripts/elf32_x86_64.x
#usr/lib/ldscripts/elf32_x86_64.xbn
@@ -137,7 +136,7 @@ usr/bin/strings
#usr/lib/ldscripts/elf_x86_64.xu
#usr/lib/ldscripts/elf_x86_64.xw
#usr/lib/ldscripts/elf_x86_64.xwe
-usr/lib/libbfd-2.40.so
+usr/lib/libbfd-2.41.so
#usr/lib/libbfd.a
#usr/lib/libbfd.la
#usr/lib/libbfd.so
@@ -151,15 +150,20 @@ usr/lib/libctf-nobfd.so.0.0.0
#usr/lib/libctf.so
usr/lib/libctf.so.0
usr/lib/libctf.so.0.0.0
-usr/lib/libopcodes-2.40.so
+#usr/lib/libgprofng.a
+#usr/lib/libgprofng.la
+#usr/lib/libgprofng.so
+usr/lib/libgprofng.so.0
+usr/lib/libgprofng.so.0.0.0
+usr/lib/libopcodes-2.41.so
#usr/lib/libopcodes.a
#usr/lib/libopcodes.la
#usr/lib/libopcodes.so
#usr/lib/libsframe.a
#usr/lib/libsframe.la
#usr/lib/libsframe.so
-usr/lib/libsframe.so.0
-usr/lib/libsframe.so.0.0.0
+usr/lib/libsframe.so.1
+usr/lib/libsframe.so.1.0.0
#usr/share/info/as.info
#usr/share/info/bfd.info
#usr/share/info/binutils.info
@@ -167,6 +171,7 @@ usr/lib/libsframe.so.0.0.0
#usr/share/info/gprof.info
#usr/share/info/gprofng.info
#usr/share/info/ld.info
+#usr/share/info/ldint.info
#usr/share/info/sframe-spec.info
#usr/share/locale/bg/LC_MESSAGES/binutils.mo
#usr/share/locale/bg/LC_MESSAGES/gprof.mo
@@ -222,8 +227,7 @@ usr/lib/libsframe.so.0.0.0
#usr/share/locale/ja/LC_MESSAGES/gas.mo
#usr/share/locale/ja/LC_MESSAGES/gprof.mo
#usr/share/locale/ja/LC_MESSAGES/ld.mo
-#usr/share/locale/ka
-#usr/share/locale/ka/LC_MESSAGES
+#usr/share/locale/ka/LC_MESSAGES/bfd.mo
#usr/share/locale/ka/LC_MESSAGES/gprof.mo
#usr/share/locale/ms
#usr/share/locale/ms/LC_MESSAGES
diff --git a/lfs/binutils b/lfs/binutils
index 101d56dfa..35b0b6a35 100644
--- a/lfs/binutils
+++ b/lfs/binutils
@@ -24,7 +24,7 @@
include Config
-VER = 2.40
+VER = 2.41
THISAPP = binutils-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -93,7 +93,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 8d799f7c595f878b9af5b17a490021dd8b8300ac2fe0ed8574c012929d22d2d0493e003a3e631a9436e8e712da801779b777c566167fe42b0bde119ffa5ad1c2
+$(DL_FILE)_BLAKE2 = 3bccec2b52f7e82a727121bf2a2e51a6249ba63dcd74c665fd834e858645c912ffd8245d848435288b938852830b482905606f55c40df4061215fd75c52ffc75
install : $(TARGET)
--
2.39.2
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 5/7] binutils: Disable building gprof-ng in toolchain
2023-08-15 17:02 [PATCH 1/7] ffmpeg: Fix build with binutils 2.41 Michael Tremer
2023-08-15 17:02 ` [PATCH 2/7] ipfire-netboot: " Michael Tremer
2023-08-15 17:02 ` [PATCH 3/7] binutils: Update to 2.41 Michael Tremer
@ 2023-08-15 17:02 ` Michael Tremer
2023-08-15 17:02 ` [PATCH 6/7] glibc: Update to 2.38 Michael Tremer
2023-08-15 17:02 ` [PATCH 7/7] make.sh: Bump toolchain version Michael Tremer
4 siblings, 0 replies; 6+ messages in thread
From: Michael Tremer @ 2023-08-15 17:02 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 547 bytes --]
This won't build against glibc 2.38. Since we don't need it, it is being
turned off.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/binutils | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lfs/binutils b/lfs/binutils
index 35b0b6a35..2b5c65592 100644
--- a/lfs/binutils
+++ b/lfs/binutils
@@ -75,7 +75,8 @@ else
--prefix=$(TOOLS_DIR) \
--with-lib-path=$(TOOLS_DIR)/lib \
--with-sysroot \
- --disable-nls
+ --disable-nls \
+ --disable-gprofng
EXTRA_MAKE =
EXTRA_INSTALL =
endif
--
2.39.2
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 6/7] glibc: Update to 2.38
2023-08-15 17:02 [PATCH 1/7] ffmpeg: Fix build with binutils 2.41 Michael Tremer
` (2 preceding siblings ...)
2023-08-15 17:02 ` [PATCH 5/7] binutils: Disable building gprof-ng in toolchain Michael Tremer
@ 2023-08-15 17:02 ` Michael Tremer
2023-08-15 17:02 ` [PATCH 7/7] make.sh: Bump toolchain version Michael Tremer
4 siblings, 0 replies; 6+ messages in thread
From: Michael Tremer @ 2023-08-15 17:02 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 6876 bytes --]
This update builds glibc with FORTIFY_SOURCE and disables building nscd
which has been unused in IPFire.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
config/rootfiles/common/aarch64/glibc | 11 ++++++++++-
config/rootfiles/common/riscv64/glibc | 7 ++++++-
config/rootfiles/common/x86_64/glibc | 9 +++++++--
lfs/glibc | 11 +++++++----
4 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/config/rootfiles/common/aarch64/glibc b/config/rootfiles/common/aarch64/glibc
index 019ea9cc0..f6cd12331 100644
--- a/config/rootfiles/common/aarch64/glibc
+++ b/config/rootfiles/common/aarch64/glibc
@@ -8,6 +8,7 @@ lib/libc.so.6
lib/libdl.so.2
lib/libm.so.6
#lib/libmemusage.so
+lib/libmvec.so.1
lib/libnsl.so.1
lib/libnss_compat.so.2
lib/libnss_db.so.2
@@ -140,6 +141,7 @@ usr/bin/locale
#usr/include/bits/resource.h
#usr/include/bits/rseq.h
#usr/include/bits/sched.h
+#usr/include/bits/select-decl.h
#usr/include/bits/select.h
#usr/include/bits/select2.h
#usr/include/bits/sem.h
@@ -191,6 +193,7 @@ usr/bin/locale
#usr/include/bits/struct_stat.h
#usr/include/bits/struct_stat_time64_helper.h
#usr/include/bits/syscall.h
+#usr/include/bits/syslog-decl.h
#usr/include/bits/syslog-ldbl.h
#usr/include/bits/syslog-path.h
#usr/include/bits/syslog.h
@@ -265,6 +268,7 @@ usr/bin/locale
#usr/include/bits/uintn-identity.h
#usr/include/bits/uio-ext.h
#usr/include/bits/uio_lim.h
+#usr/include/bits/unistd-decl.h
#usr/include/bits/unistd.h
#usr/include/bits/unistd_ext.h
#usr/include/bits/utmp.h
@@ -804,9 +808,12 @@ usr/lib/gconv
#usr/lib/libc_nonshared.a
#usr/lib/libdl.a
#usr/lib/libg.a
+#usr/lib/libm-2.38.a
#usr/lib/libm.a
#usr/lib/libm.so
#usr/lib/libmcheck.a
+#usr/lib/libmvec.a
+#usr/lib/libmvec.so
#usr/lib/libnss_compat.so
#usr/lib/libnss_db.so
#usr/lib/libnss_hesiod.so
@@ -7693,7 +7700,6 @@ usr/lib/locale
#usr/lib/locale/zu_ZA/LC_TIME
#usr/lib/rcrt1.o
#usr/sbin/iconvconfig
-#usr/sbin/nscd
#usr/sbin/zic
#usr/share/i18n
#usr/share/i18n/charmaps
@@ -8392,6 +8398,9 @@ usr/lib/locale
#usr/share/locale/pt_BR
#usr/share/locale/pt_BR/LC_MESSAGES
#usr/share/locale/pt_BR/LC_MESSAGES/libc.mo
+#usr/share/locale/ro
+#usr/share/locale/ro/LC_MESSAGES
+#usr/share/locale/ro/LC_MESSAGES/libc.mo
#usr/share/locale/ru
#usr/share/locale/ru/LC_MESSAGES
#usr/share/locale/ru/LC_MESSAGES/libc.mo
diff --git a/config/rootfiles/common/riscv64/glibc b/config/rootfiles/common/riscv64/glibc
index fd991b19e..cf1df065a 100644
--- a/config/rootfiles/common/riscv64/glibc
+++ b/config/rootfiles/common/riscv64/glibc
@@ -140,6 +140,7 @@ usr/bin/locale
#usr/include/bits/resource.h
#usr/include/bits/rseq.h
#usr/include/bits/sched.h
+#usr/include/bits/select-decl.h
#usr/include/bits/select.h
#usr/include/bits/select2.h
#usr/include/bits/sem.h
@@ -191,6 +192,7 @@ usr/bin/locale
#usr/include/bits/struct_stat.h
#usr/include/bits/struct_stat_time64_helper.h
#usr/include/bits/syscall.h
+#usr/include/bits/syslog-decl.h
#usr/include/bits/syslog-ldbl.h
#usr/include/bits/syslog-path.h
#usr/include/bits/syslog.h
@@ -265,6 +267,7 @@ usr/bin/locale
#usr/include/bits/uintn-identity.h
#usr/include/bits/uio-ext.h
#usr/include/bits/uio_lim.h
+#usr/include/bits/unistd-decl.h
#usr/include/bits/unistd.h
#usr/include/bits/unistd_ext.h
#usr/include/bits/utmp.h
@@ -7691,7 +7694,6 @@ usr/lib/locale
#usr/lib/locale/zu_ZA/LC_TELEPHONE
#usr/lib/locale/zu_ZA/LC_TIME
#usr/sbin/iconvconfig
-#usr/sbin/nscd
#usr/sbin/zic
#usr/share/i18n
#usr/share/i18n/charmaps
@@ -8390,6 +8392,9 @@ usr/lib/locale
#usr/share/locale/pt_BR
#usr/share/locale/pt_BR/LC_MESSAGES
#usr/share/locale/pt_BR/LC_MESSAGES/libc.mo
+#usr/share/locale/ro
+#usr/share/locale/ro/LC_MESSAGES
+#usr/share/locale/ro/LC_MESSAGES/libc.mo
#usr/share/locale/ru
#usr/share/locale/ru/LC_MESSAGES
#usr/share/locale/ru/LC_MESSAGES/libc.mo
diff --git a/config/rootfiles/common/x86_64/glibc b/config/rootfiles/common/x86_64/glibc
index 8a55a4183..66d310e38 100644
--- a/config/rootfiles/common/x86_64/glibc
+++ b/config/rootfiles/common/x86_64/glibc
@@ -143,6 +143,7 @@ usr/bin/locale
#usr/include/bits/resource.h
#usr/include/bits/rseq.h
#usr/include/bits/sched.h
+#usr/include/bits/select-decl.h
#usr/include/bits/select.h
#usr/include/bits/select2.h
#usr/include/bits/sem.h
@@ -194,6 +195,7 @@ usr/bin/locale
#usr/include/bits/struct_stat.h
#usr/include/bits/struct_stat_time64_helper.h
#usr/include/bits/syscall.h
+#usr/include/bits/syslog-decl.h
#usr/include/bits/syslog-ldbl.h
#usr/include/bits/syslog-path.h
#usr/include/bits/syslog.h
@@ -268,6 +270,7 @@ usr/bin/locale
#usr/include/bits/uintn-identity.h
#usr/include/bits/uio-ext.h
#usr/include/bits/uio_lim.h
+#usr/include/bits/unistd-decl.h
#usr/include/bits/unistd.h
#usr/include/bits/unistd_ext.h
#usr/include/bits/utmp.h
@@ -813,7 +816,7 @@ usr/lib/gconv
#usr/lib/libc_nonshared.a
#usr/lib/libdl.a
#usr/lib/libg.a
-#usr/lib/libm-2.37.a
+#usr/lib/libm-2.38.a
#usr/lib/libm.a
#usr/lib/libm.so
#usr/lib/libmcheck.a
@@ -7705,7 +7708,6 @@ usr/lib/locale
#usr/lib/locale/zu_ZA/LC_TIME
#usr/lib/rcrt1.o
#usr/sbin/iconvconfig
-#usr/sbin/nscd
#usr/sbin/zic
#usr/share/i18n
#usr/share/i18n/charmaps
@@ -8404,6 +8406,9 @@ usr/lib/locale
#usr/share/locale/pt_BR
#usr/share/locale/pt_BR/LC_MESSAGES
#usr/share/locale/pt_BR/LC_MESSAGES/libc.mo
+#usr/share/locale/ro
+#usr/share/locale/ro/LC_MESSAGES
+#usr/share/locale/ro/LC_MESSAGES/libc.mo
#usr/share/locale/ru
#usr/share/locale/ru/LC_MESSAGES
#usr/share/locale/ru/LC_MESSAGES/libc.mo
diff --git a/lfs/glibc b/lfs/glibc
index 05179fcc9..13f6cf16d 100644
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -24,7 +24,7 @@
include Config
-VER = 2.37
+VER = 2.38
THISAPP = glibc-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -56,12 +56,15 @@ endif
# Add some general configuration flags
EXTRA_CONFIG += \
--disable-profile \
- --enable-kernel=4.14.0 \
+ --enable-kernel=5.4.0 \
--enable-add-ons \
--without-selinux \
--enable-experimental-malloc \
--enable-bind-now \
- --disable-crypt
+ --enable-fortify-source \
+ --disable-crypt \
+ --disable-build-nscd \
+ --disable-nscd
ifeq "$(BUILD_ARCH)" "x86_64"
EXTRA_CONFIG += --enable-cet
@@ -79,7 +82,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 8139cd977b2ed3bfdbde5ffb1cda8f759763dbb83071167272fef798cfbdc0d17cfd1ec893d126c52c91511b7961f3ad12eed34534b99412dfa04a1cdd5b4ea3
+$(DL_FILE)_BLAKE2 = f9b039f0ef98a7dd8e1cba228ed10286b9e4fbe4dd89af4d26fa5c4e4cf266f19c2746b44d797ce54739d86499e74cf334aaf311bcf6e30120fd7748453e653f
install : $(TARGET)
--
2.39.2
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 7/7] make.sh: Bump toolchain version
2023-08-15 17:02 [PATCH 1/7] ffmpeg: Fix build with binutils 2.41 Michael Tremer
` (3 preceding siblings ...)
2023-08-15 17:02 ` [PATCH 6/7] glibc: Update to 2.38 Michael Tremer
@ 2023-08-15 17:02 ` Michael Tremer
4 siblings, 0 replies; 6+ messages in thread
From: Michael Tremer @ 2023-08-15 17:02 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 561 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
make.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/make.sh b/make.sh
index e74156156..f7a2f645f 100755
--- a/make.sh
+++ b/make.sh
@@ -35,7 +35,7 @@ GIT_BRANCH="$(git rev-parse --abbrev-ref HEAD)" # Git Branch
GIT_TAG="$(git tag | tail -1)" # Git Tag
GIT_LASTCOMMIT="$(git rev-parse --verify HEAD)" # Last commit
-TOOLCHAINVER=20230620
+TOOLCHAINVER=20230731
# use multicore and max compression
ZSTD_OPT="-T0 --ultra -22"
--
2.39.2
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-08-15 17:02 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-08-15 17:02 [PATCH 1/7] ffmpeg: Fix build with binutils 2.41 Michael Tremer
2023-08-15 17:02 ` [PATCH 2/7] ipfire-netboot: " Michael Tremer
2023-08-15 17:02 ` [PATCH 3/7] binutils: Update to 2.41 Michael Tremer
2023-08-15 17:02 ` [PATCH 5/7] binutils: Disable building gprof-ng in toolchain Michael Tremer
2023-08-15 17:02 ` [PATCH 6/7] glibc: Update to 2.38 Michael Tremer
2023-08-15 17:02 ` [PATCH 7/7] make.sh: Bump toolchain version Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox