From ab5400a7a2107592b364aa865f8ec76456ce0f0f Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 31 May 2018 11:01:08 +0100 Subject: [PATCH] syslinux: FTBFS with newer ld Signed-off-by: Michael Tremer --- lfs/syslinux | 1 + ...syslinux-6.03-fix-FTBFS-no-dynamic-linker.patch | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 src/patches/syslinux-6.03-fix-FTBFS-no-dynamic-linker.patch diff --git a/lfs/syslinux b/lfs/syslinux index 6b66e69466..1736d3c685 100644 --- a/lfs/syslinux +++ b/lfs/syslinux @@ -74,6 +74,7 @@ $(subst %,%_MD5,$(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/syslinux-6.03-fix-FTBFS-no-dynamic-linker.patch # Build cd $(DIR_APP) && make bios $(MAKETUNING) diff --git a/src/patches/syslinux-6.03-fix-FTBFS-no-dynamic-linker.patch b/src/patches/syslinux-6.03-fix-FTBFS-no-dynamic-linker.patch new file mode 100644 index 0000000000..091189d7b6 --- /dev/null +++ b/src/patches/syslinux-6.03-fix-FTBFS-no-dynamic-linker.patch @@ -0,0 +1,14 @@ +Fix for https://bugs.debian.org/846679 : syslinux: FTBFS: ld: +ldlinux.elf: Not enough room for program headers, try linking with -N + +--- a/core/Makefile 2017-01-28 18:33:22.750959519 +0000 ++++ b/core/Makefile 2017-01-28 18:27:47.387981830 +0000 +@@ -165,7 +165,7 @@ + + %.elf: %.o $(LIBDEP) $(LDSCRIPT) $(AUXLIBS) + $(LD) $(LDFLAGS) -Bsymbolic $(LD_PIE) -E --hash-style=gnu -T $(LDSCRIPT) -M -o $@ $< \ +- --start-group $(LIBS) $(subst $(*F).elf,lib$(*F).a,$@) --end-group \ ++ --start-group $(LIBS) $(subst $(*F).elf,lib$(*F).a,$@) --end-group --no-dynamic-linker \ + > $(@:.elf=.map) + $(OBJDUMP) -h $@ > $(@:.elf=.sec) + $(PERL) $(SRC)/lstadjust.pl $(@:.elf=.lsr) $(@:.elf=.sec) $(@:.elf=.lst) -- 2.39.5