From patchwork Sun Jun 28 19:42:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Porcedda X-Patchwork-Id: 489167 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id EE38F140779 for ; Mon, 29 Jun 2015 05:44:10 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=ZcLfhmeY; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 272E885881; Sun, 28 Jun 2015 19:44:10 +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 7nM0K3FcioKt; Sun, 28 Jun 2015 19:44:08 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 65739A16AC; Sun, 28 Jun 2015 19:43:24 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 209321C1EFA for ; Sun, 28 Jun 2015 19:43:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 1EE808A3A7 for ; Sun, 28 Jun 2015 19:43:13 +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 vBtHuSpfE7dJ for ; Sun, 28 Jun 2015 19:43:12 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f180.google.com (mail-wi0-f180.google.com [209.85.212.180]) by hemlock.osuosl.org (Postfix) with ESMTPS id 70AFA8979B for ; Sun, 28 Jun 2015 19:43:12 +0000 (UTC) Received: by wicgi11 with SMTP id gi11so55411443wic.0 for ; Sun, 28 Jun 2015 12:43:11 -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:in-reply-to:references; bh=ZM6cs+KLA1qp3jzkL1KTrOhDYpHAZRIS2ktc7UL5NlY=; b=ZcLfhmeY3vV2FDsuOZxpjJPTy7TKt0zXTkOkpctOWqjzTbsmpmevhjtuPNKgy2X4rT V/PTO+7wUx1TANAjBuZjTHSSI3iPPHRAn+nE6xw1p9veKLMaTO1uj+26s/g4MRWpODRQ L30RPkPmB2I/BJsaI6iIL1O8H9FXwtsBGkas+ZEjwsvJATbonU6ukezhYlj+lgeL4tII v1QSvX50hTtssMcRz8FHYl61iQIZD95SIMwmBB/XROkJQkhtvDmv3eAktHh4Wj6z1RUm 2WJcjH2dTK78aNEjrQM02aMJ6oSEKSlAEyrk312bLJut6fDTgezB89eTUEe25ppa9In+ bVWg== X-Received: by 10.180.13.175 with SMTP id i15mr15804492wic.30.1435520591136; Sun, 28 Jun 2015 12:43:11 -0700 (PDT) Received: from beast.localdomain (dynamic-adsl-78-15-144-100.clienti.tiscali.it. [78.15.144.100]) by mx.google.com with ESMTPSA id ex8sm3789243wjc.34.2015.06.28.12.43.10 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Jun 2015 12:43:10 -0700 (PDT) From: Fabio Porcedda To: buildroot@uclibc.org Date: Sun, 28 Jun 2015 21:42:48 +0200 Message-Id: <1435520570-20332-15-git-send-email-fabio.porcedda@gmail.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1435520570-20332-1-git-send-email-fabio.porcedda@gmail.com> References: <1435520570-20332-1-git-send-email-fabio.porcedda@gmail.com> Subject: [Buildroot] [RFC v4 14/16] Makefile: add STAGINGNOPKG_DIR variable X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 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" When the per-package staging feature will be added, the STAGING_DIR variable will be used to refer to the per-package staging directory so to be able to refer to the original STAGING_DIR a STAGINGNOPKG_DIR is added. Signed-off-by: Fabio Porcedda --- Makefile | 14 +++++--------- package/Makefile.in | 1 + 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index a0d4abb..b4e5a10 100644 --- a/Makefile +++ b/Makefile @@ -437,15 +437,11 @@ else LIB_SYMLINK = lib32 endif -$(STAGING_DIR): - @mkdir -p $(STAGING_DIR)/bin - @mkdir -p $(STAGING_DIR)/lib - @ln -snf lib $(STAGING_DIR)/$(LIB_SYMLINK) - @mkdir -p $(STAGING_DIR)/usr/lib - @ln -snf lib $(STAGING_DIR)/usr/$(LIB_SYMLINK) - @mkdir -p $(STAGING_DIR)/usr/include - @mkdir -p $(STAGING_DIR)/usr/bin - @ln -snf $(STAGING_DIR) $(BASE_DIR)/staging +$(STAGINGNOPKG_DIR): + @mkdir -p $@/bin $@/lib $@/usr/lib $@/usr/include $@/usr/bin + @ln -snf lib $@/$(LIB_SYMLINK) + @ln -snf lib $@/usr/$(LIB_SYMLINK) + @ln -snf $@ $(BASE_DIR)/staging ifeq ($(BR2_ROOTFS_SKELETON_CUSTOM),y) TARGET_SKELETON = $(BR2_ROOTFS_SKELETON_CUSTOM_PATH) diff --git a/package/Makefile.in b/package/Makefile.in index 924c808..169c6b3 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -109,6 +109,7 @@ endif STAGING_SUBDIR = usr/$(GNU_TARGET_NAME)/sysroot STAGING_DIR = $(HOST_DIR)/$(STAGING_SUBDIR) +STAGINGNOPKG_DIR := $(STAGING_DIR) TARGET_OPTIMIZATION := $(call qstrip,$(BR2_TARGET_OPTIMIZATION))