From patchwork Mon Jul 16 21:38:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Martin X-Patchwork-Id: 171270 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 38C5B2C012A for ; Tue, 17 Jul 2012 07:39:59 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 4CC79A0191; Mon, 16 Jul 2012 21:39: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 D5SpMdOVAnmU; Mon, 16 Jul 2012 21:39:55 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 81EFDA02EF; Mon, 16 Jul 2012 21:39:33 +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 BB4948F753 for ; Mon, 16 Jul 2012 21:39:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6EAD1854BD for ; Mon, 16 Jul 2012 21:39:31 +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 NET-VSQG6fwc for ; Mon, 16 Jul 2012 21:39:29 +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 6D1F880597 for ; Mon, 16 Jul 2012 21:39:29 +0000 (UTC) Received: by mail-we0-f171.google.com with SMTP id x43so8345129wey.16 for ; Mon, 16 Jul 2012 14:39:29 -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=yTG2/mNjHMBY8PVaT/61V5el5un8RDsB+b7vngvCtLI=; b=QjbIjTEkdAjJffG31xJFIhiShfFls7o37Jchz7zrIKP6FJ4iT4wZ7p13lpET0Trgmm bxfmmdBHJmfdTNXVy7dzIBDQRJ5I5587VgMiiOpfbN5qjYbXnRAhnPgKDSsfFuNicjGq 7IEpsC60vwvpQsmmreQOU0f8s90dBFnjjjZyTz791pAydgX3PILlssl4fZKiOzI3qsL2 BfWNFZEGYU7Z27JS+3bpOTnphEVhKuilVeUw+vzxXt0NvlMAMKXD+e5b3o9gK+h+neGn i2B6CUa47YO98r8tlxURM0U2/Og7VraLuD/8T0YJZV+c47eBAfA1StfkuKkM/YpAQF/t 5z+g== Received: by 10.216.145.149 with SMTP id p21mr13496wej.1.1342474769078; Mon, 16 Jul 2012 14:39:29 -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 o2sm34727917wiz.11.2012.07.16.14.39.27 (version=SSLv3 cipher=OTHER); Mon, 16 Jul 2012 14:39:28 -0700 (PDT) From: Samuel Martin To: buildroot@busybox.net Date: Mon, 16 Jul 2012 23:38:06 +0200 Message-Id: <1342474686-10167-2-git-send-email-s.martin49@gmail.com> X-Mailer: git-send-email 1.7.11.2 In-Reply-To: <1342474686-10167-1-git-send-email-s.martin49@gmail.com> References: <1342474686-10167-1-git-send-email-s.martin49@gmail.com> Subject: [Buildroot] [PATCH v4 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 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