From patchwork Wed Jul 18 21:17:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Neumann X-Patchwork-Id: 171843 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id B52692C008C for ; Thu, 19 Jul 2012 07:18:55 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 11337A049C; Wed, 18 Jul 2012 21:18:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id j6GHGrTyMvHE; Wed, 18 Jul 2012 21:18:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 44778A04AD; Wed, 18 Jul 2012 21:18:39 +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 76D408F75B for ; Wed, 18 Jul 2012 21:18:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 49F158427D for ; Wed, 18 Jul 2012 21:18:35 +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 sMw-MtF3lNFw for ; Wed, 18 Jul 2012 21:18:23 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail.zonque.de (svenfoo.org [82.94.215.22]) by whitealder.osuosl.org (Postfix) with ESMTPS id A182B8D6BE for ; Wed, 18 Jul 2012 21:17:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.zonque.de (Postfix) with ESMTP id 9F475C0299; Wed, 18 Jul 2012 23:17:50 +0200 (CEST) Received: from mail.zonque.de ([127.0.0.1]) by localhost (rambrand.bugwerft.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id i4ZDqB4BHowZ; Wed, 18 Jul 2012 23:17:50 +0200 (CEST) Received: from localhost.localdomain (ip-2-207-85-39.web.vodafone.de [2.207.85.39]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.zonque.de (Postfix) with ESMTPSA id 027BBC007E; Wed, 18 Jul 2012 23:17:49 +0200 (CEST) From: Sven Neumann To: buildroot@busybox.net Date: Wed, 18 Jul 2012 23:17:37 +0200 Message-Id: <1342646260-11203-3-git-send-email-s.neumann@raumfeld.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1342646260-11203-1-git-send-email-s.neumann@raumfeld.com> References: <1342646260-11203-1-git-send-email-s.neumann@raumfeld.com> Subject: [Buildroot] [PATCH 2/5] libglib2: fix linker flags 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 The Makefiles distributed with glib 2.32 omit some needed linker flags. Fix this and autoreconf to get the changes applied. Signed-off-by: Sven Neumann --- package/libglib2/libglib2-fix-linker-flags.patch | 36 ++++++++++++++++++++++ package/libglib2/libglib2.mk | 1 + 2 files changed, 37 insertions(+) create mode 100644 package/libglib2/libglib2-fix-linker-flags.patch diff --git a/package/libglib2/libglib2-fix-linker-flags.patch b/package/libglib2/libglib2-fix-linker-flags.patch new file mode 100644 index 0000000..cc8facf --- /dev/null +++ b/package/libglib2/libglib2-fix-linker-flags.patch @@ -0,0 +1,36 @@ +--- libglib2-2.31.18-orig/gio/Makefile.am 2012-02-20 21:23:17.000000000 +0100 ++++ libglib2-2.31.18/gio/Makefile.am 2012-02-29 12:10:35.680474728 +0100 +@@ -647,6 +647,7 @@ + glib_compile_resources_LDADD = \ + $(top_builddir)/glib/libglib-2.0.la \ + $(top_builddir)/gobject/libgobject-2.0.la \ ++ $(top_builddir)/gmodule/libgmodule-2.0.la \ + libgio-2.0.la + + glib_compile_resources_SOURCES = \ +@@ -677,6 +678,7 @@ + gsettings_LDADD = \ + $(top_builddir)/glib/libglib-2.0.la \ + $(top_builddir)/gobject/libgobject-2.0.la \ ++ $(top_builddir)/gmodule/libgmodule-2.0.la \ + libgio-2.0.la + gsettings_SOURCES = gsettings-tool.c + +@@ -690,7 +692,8 @@ + gdbus_SOURCES = gdbus-tool.c + gdbus_LDADD = libgio-2.0.la \ + $(top_builddir)/glib/libglib-2.0.la \ +- $(top_builddir)/gobject/libgobject-2.0.la ++ $(top_builddir)/gobject/libgobject-2.0.la \ ++ $(top_builddir)/gmodule/libgmodule-2.0.la + + completiondir = $(sysconfdir)/bash_completion.d + completion_DATA = \ +@@ -707,6 +710,7 @@ + gresource_LDADD = libgio-2.0.la \ + $(top_builddir)/glib/libglib-2.0.la \ + $(top_builddir)/gobject/libgobject-2.0.la \ ++ $(top_builddir)/gmodule/libgmodule-2.0.la \ + $(ELF_LIBS) + + # ------------------------------------------------------------------------ diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index 976caf0..cc76669 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -9,6 +9,7 @@ LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).$(LIBGLIB2_VERSION_MINOR) LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) +LIBGLIB2_AUTORECONF = YES LIBGLIB2_INSTALL_STAGING = YES LIBGLIB2_INSTALL_TARGET = YES LIBGLIB2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install