From patchwork Wed Jul 18 21:17:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Neumann X-Patchwork-Id: 171844 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 804892C007E for ; Thu, 19 Jul 2012 07:18:59 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 75B97A0469; Wed, 18 Jul 2012 21:18:58 +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 I3Ml85VUIBnK; Wed, 18 Jul 2012 21:18:52 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 10EF9A04B8; Wed, 18 Jul 2012 21:18:41 +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 CBEAE8F75B 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 B5DFC8D6BE 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 lnpBh1G1TLXQ for ; Wed, 18 Jul 2012 21:18:25 +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 7C6EE898D0 for ; Wed, 18 Jul 2012 21:17:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.zonque.de (Postfix) with ESMTP id 8EC82C0294; Wed, 18 Jul 2012 23:17:51 +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 qO8A1VtfVhNf; Wed, 18 Jul 2012 23:17:51 +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 C9123C007E; Wed, 18 Jul 2012 23:17:50 +0200 (CEST) From: Sven Neumann To: buildroot@busybox.net Date: Wed, 18 Jul 2012 23:17:38 +0200 Message-Id: <1342646260-11203-4-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 3/5] libglib2: fix alignment checks 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 configure script fails to calculate alignments when cross-compiling. This commit hardcodes alignments for 32 bit platforms. It will need to be adjusted for other platforms. Please advice on how to fix this properly. Signed-off-by: Sven Neumann --- .../libglib2/libglib2-fix-alignment-tests.patch | 35 ++++++++++++++++++++ package/libglib2/libglib2.mk | 1 + 2 files changed, 36 insertions(+) create mode 100644 package/libglib2/libglib2-fix-alignment-tests.patch diff --git a/package/libglib2/libglib2-fix-alignment-tests.patch b/package/libglib2/libglib2-fix-alignment-tests.patch new file mode 100644 index 0000000..a0f88ff --- /dev/null +++ b/package/libglib2/libglib2-fix-alignment-tests.patch @@ -0,0 +1,35 @@ +From 8f8fc836709cff58bd666b87937542088cfc19db Mon Sep 17 00:00:00 2001 +From: Kalev Lember +Date: Wed, 28 Mar 2012 12:42:49 +0300 +Subject: [PATCH] configure: Fix alignment tests when cross compiling + +When inserting custom code to AC_CHECK_ALIGNOF, make sure to not replace +the default includes, but instead append to them. + +This fixes ALIGNOF_GUINT32 and ALIGNOF_GUINT64 that were both 0 when cross +compiling. The third 'unsigned long' test wasn't affected because the +AC_CHECK_ALIGNOF call didn't specify the optional 2nd parameter. +--- + configure.ac | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 0d30b3e..82d74c6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3405,8 +3405,10 @@ $ac_cv_sizeof___int64) + ;; + esac + +-AC_CHECK_ALIGNOF([guint32], [typedef unsigned $gint32 guint32;]) +-AC_CHECK_ALIGNOF([guint64], typedef unsigned $gint64 guint64;) ++AC_CHECK_ALIGNOF([guint32], [AC_INCLUDES_DEFAULT ++typedef unsigned $gint32 guint32;]) ++AC_CHECK_ALIGNOF([guint64], [AC_INCLUDES_DEFAULT ++typedef unsigned $gint64 guint64;]) + AC_CHECK_ALIGNOF([unsigned long]) + + # Check for libdbus1 - Optional - is only used in the GDBus test cases +-- +1.7.9.1 + diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index cc76669..004312f 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -43,6 +43,7 @@ LIBGLIB2_CONF_ENV = \ ac_use_included_regex=no gl_cv_c_restrict=no \ ac_cv_path_GLIB_GENMARSHAL=$(HOST_DIR)/usr/bin/glib-genmarshal ac_cv_prog_F77=no \ ac_cv_func_posix_getgrgid_r=no \ + ac_cv_alignof_guint32=4 ac_cv_alignof_guint64=8 ac_cv_alignof_unsigned_long=4 \ gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no) # old uClibc versions don't provide qsort_r