From patchwork Thu Jul 24 17:49:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas De Schampheleire X-Patchwork-Id: 373476 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 1875B140216 for ; Fri, 25 Jul 2014 03:50:58 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 735D18B1C2; Thu, 24 Jul 2014 17:50:55 +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 Tp42fH01mVYS; Thu, 24 Jul 2014 17:50:54 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3AFD98B1F3; Thu, 24 Jul 2014 17:50:52 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id E3B611C28CA for ; Thu, 24 Jul 2014 17:50:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id DD8128948B for ; Thu, 24 Jul 2014 17:50:45 +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 ECu5-+w8ZaCK for ; Thu, 24 Jul 2014 17:50:45 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-we0-f175.google.com (mail-we0-f175.google.com [74.125.82.175]) by hemlock.osuosl.org (Postfix) with ESMTPS id 415798952C for ; Thu, 24 Jul 2014 17:50:45 +0000 (UTC) Received: by mail-we0-f175.google.com with SMTP id t60so3172497wes.34 for ; Thu, 24 Jul 2014 10:50:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:content-transfer-encoding:subject :message-id:in-reply-to:references:user-agent:date:from:to:cc; bh=8ZUOSCxrZRnq24Sk8cmTcWd9keqtYIgy5XTV7dWMCPs=; b=Oz//GFzTHnNdWL78sfeZauvx9/fHjH+YzX01Ex1+IEhJXWMUBmf356sSUEbzztFSaj aVQMEQI9hxsBnMd/dUHaR6RHrIz1mHmvrxzHBNdRLqgnroxTQqO2DtJV5E26B5/vrKkZ /KESVwF9oqfITc6NU2EPF5tEzviDAxo8LbB/maA7/dse7XZMskK4vVol2R6TGMbPs4CQ UdrhAOHxWIiJVRdwyr+eYcR24cYeGm7Jy5Qskk3W5suDFX9du7ZhHbTk67422Uzgfvw1 sNFWhz0uFiUcIv7RnyuPiuDAIrqonIZobj8KBTGADgU9NbmMLjC4DO2xcj0i64c5U4c7 4l6w== X-Received: by 10.180.103.74 with SMTP id fu10mr15136264wib.47.1406224243805; Thu, 24 Jul 2014 10:50:43 -0700 (PDT) Received: from [127.0.0.1] ([109.140.129.55]) by mx.google.com with ESMTPSA id gc8sm25348272wic.3.2014.07.24.10.50.42 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Jul 2014 10:50:42 -0700 (PDT) MIME-Version: 1.0 X-Mercurial-Node: ec98df5449b08309c4e8c997498bdf972a162a5a Message-Id: In-Reply-To: References: User-Agent: Mercurial-patchbomb/2.7.2 Date: Thu, 24 Jul 2014 19:49:30 +0200 From: Thomas De Schampheleire To: buildroot@buildroot.org Cc: thomas.petazzoni@free-electrons.com, "Yann E. MORIN" Subject: [Buildroot] [PATCH 3 of 7] uclibc: convert to kconfig-package infrastructure 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: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net This patch converts the uclibc package to the new kconfig-package infrastructure, thus removing code duplication and ensuring a consistent behavior of kconfig packages. Signed-off-by: Thomas De Schampheleire --- package/uclibc/uclibc.mk | 21 ++++----------------- 1 files changed, 4 insertions(+), 17 deletions(-) diff -r 7c00a2ad3724 -r ec98df5449b0 package/uclibc/uclibc.mk --- a/package/uclibc/uclibc.mk Wed Jul 23 21:12:48 2014 +0200 +++ b/package/uclibc/uclibc.mk Tue Jul 22 20:35:36 2014 +0200 @@ -393,7 +393,7 @@ UCLIBC_EXTRA_CFLAGS="$(UCLIBC_EXTRA_CFLAGS) $(TARGET_ABI)" \ HOSTCC="$(HOSTCC)" -define UCLIBC_FIXUP_DOT_CONFIG +define UCLIBC_KCONFIG_FIXUP_CMDS $(call KCONFIG_SET_OPT,CROSS_COMPILER_PREFIX,"$(TARGET_CROSS)",$(@D)/.config) $(call KCONFIG_ENABLE_OPT,TARGET_$(UCLIBC_TARGET_ARCH),$(@D)/.config) $(call KCONFIG_SET_OPT,TARGET_ARCH,"$(UCLIBC_TARGET_ARCH)",$(@D)/.config) @@ -533,27 +533,14 @@ $(eval $(generic-package)) -$(UCLIBC_DIR)/.config: $(UCLIBC_CONFIG_FILE) | uclibc-patch - $(INSTALL) -m 0644 $(UCLIBC_CONFIG_FILE) $(UCLIBC_DIR)/.config - -$(UCLIBC_DIR)/.stamp_config_fixup_done: $(UCLIBC_DIR)/.config - $(UCLIBC_FIXUP_DOT_CONFIG) - $(Q)touch $@ - -$(UCLIBC_TARGET_CONFIGURE): $(UCLIBC_DIR)/.stamp_config_fixup_done - -uclibc-menuconfig: $(UCLIBC_DIR)/.config - $(MAKE) -C $(UCLIBC_DIR) \ +UCLIBC_KCONFIG_FILE = $(UCLIBC_CONFIG_FILE) +UCLIBC_KCONFIG_OPT = \ $(UCLIBC_MAKE_FLAGS) \ PREFIX=$(STAGING_DIR) \ DEVEL_PREFIX=/usr/ \ RUNTIME_PREFIX=$(STAGING_DIR)/ \ - menuconfig - rm -f $(UCLIBC_DIR)/.stamp_{config_fixup_done,configured,built} - rm -f $(UCLIBC_DIR)/.stamp_{target,staging}_installed -uclibc-update-config: $(UCLIBC_DIR)/.stamp_config_fixup_done - cp -f $(UCLIBC_DIR)/.config $(UCLIBC_CONFIG_FILE) +$(eval $(kconfig-package)) # Before uClibc is built, we must have the second stage cross-compiler $(UCLIBC_TARGET_BUILD): | host-gcc-intermediate