From patchwork Thu Jul 5 20:01:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aras Vaichas X-Patchwork-Id: 169257 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id B01AE2C007F for ; Fri, 6 Jul 2012 06:02:59 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A3F0A8D372; Thu, 5 Jul 2012 20:02:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5GybvdGdgwWi; Thu, 5 Jul 2012 20:02:40 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 8FB898D09F; Thu, 5 Jul 2012 20:02:30 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 09D328F753 for ; Thu, 5 Jul 2012 20:02:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9DD238D0B0 for ; Thu, 5 Jul 2012 20:02:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Fv1MyQPAtFqK for ; Thu, 5 Jul 2012 20:02:16 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from viper.mind.be (132.79-246-81.adsl-static.isp.belgacom.be [81.246.79.132]) by whitealder.osuosl.org (Postfix) with ESMTPS id 07B8E8D02A for ; Thu, 5 Jul 2012 20:02:14 +0000 (UTC) Received: from [172.16.2.6] (helo=vandecaa-laptop) by viper.mind.be with esmtp (Exim 4.69) (envelope-from ) id 1SmsFZ-0003Cj-DY; Thu, 05 Jul 2012 22:02:11 +0200 Received: from arnout by vandecaa-laptop with local (Exim 4.80) (envelope-from ) id 1SmsFY-0003j2-Tm; Thu, 05 Jul 2012 22:02:04 +0200 From: Aras Vaichas To: buildroot@busybox.net Date: Thu, 5 Jul 2012 22:01:31 +0200 Message-Id: <1341518491-14146-1-git-send-email-aras.vaichas@gmail.com> X-Mailer: git-send-email 1.7.10 In-reply-to: <4FF5F191.4050404@mind.be> References: <4FF5F191.4050404@mind.be> Subject: [Buildroot] [PATCH v2] syslinux: bump to 4.05 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net * 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 * add util-linux dependency and make sure the build finds it Signed-off-by: Aras Vaichas Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- v2 [Arnout]: - Fix whitespace problems - util-linux dependency for libuuid boot/syslinux/syslinux-build-fix-for-uuid.patch | 15 +++++++++++++++ boot/syslinux/syslinux.mk | 9 ++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/boot/syslinux/syslinux-build-fix-for-uuid.patch b/boot/syslinux/syslinux-build-fix-for-uuid.patch new file mode 100644 index 0000000..04ff562 --- /dev/null +++ b/boot/syslinux/syslinux-build-fix-for-uuid.patch @@ -0,0 +1,15 @@ +Author: Micah Gersten +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 $@ $^ diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk index 3e89bdf..185baab 100644 --- a/boot/syslinux/syslinux.mk +++ b/boot/syslinux/syslinux.mk @@ -4,17 +4,20 @@ # ############################################################# -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/ SYSLINUX_INSTALL_TARGET = NO SYSLINUX_INSTALL_IMAGES = YES -SYSLINUX_DEPENDENCIES = host-nasm +SYSLINUX_DEPENDENCIES = host-nasm host-util-linux +# syslinux build system has no convenient way to pass CFLAGS, +# and the internal zlib should take precedence so -I shouldn't +# be used. define SYSLINUX_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) CC="$(HOSTCC)" AR="$(HOSTAR)" -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) CC="$(HOSTCC) -idirafter $(HOST_DIR)/usr/include $(HOST_LDFLAGS)" AR="$(HOSTAR)" -C $(@D) endef SYSLINUX_IMAGES-$(BR2_TARGET_SYSLINUX_ISOLINUX) += isolinux.bin