Patchwork syslinux: bump to 4.05

login
register
mail settings
Submitter Aras Vaichas
Date July 4, 2012, 1:04 p.m.
Message ID <CAJkQPOm7x8898X-bjDhN+LRN_EY8wR46WWj7hZmFOD0Q8YiASA@mail.gmail.com>
Download mbox | patch
Permalink /patch/168981/
State Superseded
Headers show

Comments

Aras Vaichas - July 4, 2012, 1:04 p.m.
* bump syslinux from 4.04 to 4.05
* add patch to fix build problem with 4.05, see
http://old.nabble.com/syslinux-fails-to-build-td34112447.html

Signed-off-by: Aras Vaichas <aras.vaichas@gmail.com>
---
 syslinux-build-fix-for-uuid.patch |   15 +++++++++++++++
 syslinux.mk                         |    2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)
diff -Naur a/boot/syslinux/syslinux-build-fix-for-uuid.patch
b/boot/syslinux/syslinux-build-fix-for-uuid.patch
--- a/boot/syslinux/syslinux-build-fix-for-uuid.patch   1970-01-01
01:00:00.000000000 +0100
+++ b/boot/syslinux/syslinux-build-fix-for-uuid.patch   2012-07-04
13:19:05.263191733 +0100
@@ -0,0 +1,15 @@
+Author: Micah Gersten <micahg@ubuntu.com>
+Description: Fix build failure with --as-needed (Closes: #654838).
+
+diff -Naurp syslinux.orig/utils/Makefile syslinux/utils/Makefile
+--- syslinux.orig/utils/Makefile       2011-12-23 14:53:26.653571511 +0100
++++ syslinux/utils/Makefile    2012-01-22 18:55:03.849466924 +0100
+@@ -51,7 +51,7 @@ isohdpfx.c: $(ISOHDPFX) isohdpfxarray.pl
+       $(PERL) isohdpfxarray.pl $(ISOHDPFX) > $@
+
+ isohybrid: isohybrid.o isohdpfx.o
+-      $(CC) $(LDFLAGS) -luuid -o $@ $^
++      $(CC) $(LDFLAGS) -o $@ $^ -luuid
+
+ gethostip: gethostip.o
+       $(CC) $(LDFLAGS) -o $@ $^
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Arnout Vandecappelle - July 5, 2012, 7:57 p.m.
On 07/04/12 15:04, Aras Vaichas wrote:
> * bump syslinux from 4.04 to 4.05
> * add patch to fix build problem with 4.05, see
> http://old.nabble.com/syslinux-fails-to-build-td34112447.html
>
> Signed-off-by: Aras Vaichas<aras.vaichas@gmail.com>
> ---
>   syslinux-build-fix-for-uuid.patch |   15 +++++++++++++++
>   syslinux.mk                         |    2 +-
>   2 files changed, 16 insertions(+), 1 deletion(-)
> diff -Naur a/boot/syslinux/syslinux-build-fix-for-uuid.patch
> b/boot/syslinux/syslinux-build-fix-for-uuid.patch
> --- a/boot/syslinux/syslinux-build-fix-for-uuid.patch   1970-01-01
> 01:00:00.000000000 +0100
> +++ b/boot/syslinux/syslinux-build-fix-for-uuid.patch   2012-07-04
> 13:19:05.263191733 +0100

  Looks like your patch is wordwrapped.  You can't send patches through the
GMail web interface.  The best option is to use git send-email - its help
page explains how to set it up for use with GMail.

> @@ -0,0 +1,15 @@
> +Author: Micah Gersten<micahg@ubuntu.com>
> +Description: Fix build failure with --as-needed (Closes: #654838).
> +
> +diff -Naurp syslinux.orig/utils/Makefile syslinux/utils/Makefile
> +--- syslinux.orig/utils/Makefile       2011-12-23 14:53:26.653571511 +0100
> ++++ syslinux/utils/Makefile    2012-01-22 18:55:03.849466924 +0100
> +@@ -51,7 +51,7 @@ isohdpfx.c: $(ISOHDPFX) isohdpfxarray.pl
> +       $(PERL) isohdpfxarray.pl $(ISOHDPFX)>  $@
> +
> + isohybrid: isohybrid.o isohdpfx.o
> +-      $(CC) $(LDFLAGS) -luuid -o $@ $^
> ++      $(CC) $(LDFLAGS) -o $@ $^ -luuid

  Unfortunately, this isn't enough.  You need host-util-linux as well, and
some additional arguments have to be passed to the build command to make
sure uuid/uuid.h and libuuid.so are found.

  It looks like the syslinux build system is as broken as the one of grub;
we currently don't actually cross-compile, but use the host compiler in
the assumption that it's an x86 multilib compiler...

  I'll fix it (still using the host compiler for the time being) and
resend your patch.


  Regards,
  Arnout

[snip]
Thomas Petazzoni - July 6, 2012, 7:34 a.m.
Le Thu, 05 Jul 2012 21:57:05 +0200,
Arnout Vandecappelle <arnout@mind.be> a écrit :

>   It looks like the syslinux build system is as broken as the one of
> grub; we currently don't actually cross-compile, but use the host
> compiler in the assumption that it's an x86 multilib compiler...
> 
>   I'll fix it (still using the host compiler for the time being) and
> resend your patch.

Yes, just like Grub, I think we should use the host compiler, otherwise
if the targeted system is x86-64, our cross-compiling toolchain will be
64 bits only, and we won't be able to build syslinux or grub.

At some point, Jean-Christophe Plagnol-Villard made a patch that
allowed some packages to depend on the host architecture (so that
things like SAM-BA wouldn't be shown). Maybe we need to use something
like this to hide syslinux/grub when the host architecture is not
x86/x86-64.

Best regards,

Thomas

Patch

diff -Naur a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk
--- a/boot/syslinux/syslinux.mk 2012-07-04 13:01:21.650250091 +0100
+++ b/boot/syslinux/syslinux.mk 2012-07-04 11:25:35.169427290 +0100
@@ -4,7 +4,7 @@ 
 #
 #############################################################

-SYSLINUX_VERSION = 4.04
+SYSLINUX_VERSION = 4.05
 SYSLINUX_SOURCE  = syslinux-$(SYSLINUX_VERSION).tar.bz2
 SYSLINUX_SITE    = $(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux/4.xx/
_______________________________________________