From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 31 May 2018 10:01:08 +0000 (+0100)
Subject: syslinux: FTBFS with newer ld
X-Git-Tag: v2.21-core124~77^2~52
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b661333e3a4359c4dcf7cf68a7537fe84ecdee34;p=ipfire-2.x.git

syslinux: FTBFS with newer ld

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

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)