From patchwork Sat Jun 2 22:08:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Martin X-Patchwork-Id: 162457 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 1318CB6FA4 for ; Sun, 3 Jun 2012 08:09:38 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0B1B0FF982; Sat, 2 Jun 2012 22:09:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Xh7cByNgNKHi; Sat, 2 Jun 2012 22:09:31 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 11877FF8C6; Sat, 2 Jun 2012 22:09:24 +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 5CE498F753 for ; Sat, 2 Jun 2012 22:09:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 517B884154 for ; Sat, 2 Jun 2012 22:09:22 +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 hD2wXBQV0U5c for ; Sat, 2 Jun 2012 22:09:20 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-we0-f171.google.com (mail-we0-f171.google.com [74.125.82.171]) by whitealder.osuosl.org (Postfix) with ESMTPS id 15EFC82958 for ; Sat, 2 Jun 2012 22:09:19 +0000 (UTC) Received: by wejx9 with SMTP id x9so4363370wej.16 for ; Sat, 02 Jun 2012 15:09:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=8Byjpn0/eOAQC2TdYHpbpRVD566ut7FPZHSIqdzOr58=; b=H0HZgIyNk+BLYQryZoRlX0aU72V76GXtPAntDaMswfKW8X+RGr3yrbXCSVNomV5jyv XKBhh3DvnYSBFcjq7V9bNtF5eiOqyjFUwCQivJvek2JA1vT/xJpKzR0hhb1ZyC5kioi8 fuUMMzzZDjTgYz9+8Vdgy+VqdWJk1FSKwiNuUd8Ksjy9QUoaahctBn5dvoeKdlA1Z+Es HxbLhbtCsKi7wggb0OJ9/PfYTkZgzMt3QDKCq85E1j1e0FGoMdxArpArnjbuxZH+DFQ5 /7jr8CG2Rmv2rHaXwP8dCnJBwR74qEXujBLp/6KSuOFmbhkWgDujEHbPWqzNcYek+kbZ OyKA== Received: by 10.216.141.15 with SMTP id f15mr6032744wej.82.1338674958222; Sat, 02 Jun 2012 15:09:18 -0700 (PDT) Received: from localhost.localdomain (ivr94-4-82-229-165-48.fbx.proxad.net. [82.229.165.48]) by mx.google.com with ESMTPS id ei4sm12515729wid.5.2012.06.02.15.09.16 (version=SSLv3 cipher=OTHER); Sat, 02 Jun 2012 15:09:17 -0700 (PDT) From: Samuel Martin To: buildroot@busybox.net Date: Sun, 3 Jun 2012 00:08:17 +0200 Message-Id: <1338674897-1810-2-git-send-email-s.martin49@gmail.com> X-Mailer: git-send-email 1.7.10.3 In-Reply-To: <1338674897-1810-1-git-send-email-s.martin49@gmail.com> References: <1338674897-1810-1-git-send-email-s.martin49@gmail.com> Subject: [Buildroot] [PATCH v3 2/2] libglib2: fix install even if the host python binary refers to python3 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 libglib2's build system uses some python2 scripts in the install rules. This patch ensures to have a valid host python2 binary and enforces this python2 binary at configure-time. Signed-off-by: Samuel Martin Acked-by: Arnout Vandecappelle (Essensium/Mind) diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index d2445a1..500f309 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -42,7 +42,10 @@ 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 \ - gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no) + gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no) \ + ac_cv_path_PYTHON=$(PYTHON2) + +HOST_LIBGLIB2_CONF_ENV += ac_cv_path_PYTHON=$(PYTHON2) # old uClibc versions don't provide qsort_r ifeq ($(BR2_UCLIBC_VERSION_0_9_31)$(BR2_UCLIBC_VERSION_0_9_32)$(BR2_TOOLCHAIN_CTNG_uClibc)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y) @@ -57,7 +60,9 @@ HOST_LIBGLIB2_CONF_OPT = \ LIBGLIB2_DEPENDENCIES = host-pkg-config host-libglib2 libffi zlib $(if $(BR2_NEEDS_GETTEXT),gettext libintl) -HOST_LIBGLIB2_DEPENDENCIES = host-pkg-config host-libffi host-zlib +HOST_LIBGLIB2_DEPENDENCIES = host-pkg-config host-libffi host-zlib $(NEED_PYTHON2) + +LIBGLIB2_DEPENDENCIES += $(NEED_PYTHON2) ifneq ($(BR2_ENABLE_LOCALE),y) LIBGLIB2_DEPENDENCIES += libiconv