From patchwork Wed Sep 26 19:33:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valentine Barshak X-Patchwork-Id: 187184 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 0739D2C007F for ; Thu, 27 Sep 2012 05:34:24 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 35D938BBF3; Wed, 26 Sep 2012 19:34: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 0XK6tkNZGlVt; Wed, 26 Sep 2012 19:34:13 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 6ADB68BEAC; Wed, 26 Sep 2012 19:33:45 +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 76B888F74A for ; Wed, 26 Sep 2012 19:33:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 740E68BEAC for ; Wed, 26 Sep 2012 19:33:44 +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 lh9lviBoOATZ for ; Wed, 26 Sep 2012 19:33:36 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lb0-f171.google.com (mail-lb0-f171.google.com [209.85.217.171]) by whitealder.osuosl.org (Postfix) with ESMTPS id 7E8278C8F3 for ; Wed, 26 Sep 2012 19:33:08 +0000 (UTC) Received: by lbom4 with SMTP id m4so5152220lbo.16 for ; Wed, 26 Sep 2012 12:33:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:subject:message-id:reply-to:mime-version:content-type :content-disposition:in-reply-to:user-agent; bh=hT4AdQZq1v0sdrdirTg39ImkM0JX5R/MuYLoXogmnW8=; b=FgEn2ZyjQEwD4RLd/SZdXeTow8ePT+RbocxoX+jCujlTtOSEGqPaMPe9Lev8al+pxi lqdFYlAb3Xr+KqZ+D/4uxJt9zPFLC7FUVFA4uxaF7izvwH3dIPjau8uclzBjnqXwrErk cABdm6LoV5Ojn2Ux96i+C5rcnUGjc7kXTN9/vPUWJ5VAwDgoe72EsmMXEwlvf4JVThhX +mR4UijW3CHeX5vJVta5I7Ahr1L1yhWrBmTVhILql8zgcLvVsD5LuYJjs3CQvcoFfUrL vjnUdYQs5CFU7BRRi9/tZc8QLWZQfe0PaIESMbpDUVLSy6Ovg3rG44I9UxXhzud8/WGB 60mw== Received: by 10.152.131.68 with SMTP id ok4mr1389006lab.47.1348687986258; Wed, 26 Sep 2012 12:33:06 -0700 (PDT) Received: from gmail.com ([93.100.122.208]) by mx.google.com with ESMTPS id hz16sm1146720lab.6.2012.09.26.12.33.05 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 26 Sep 2012 12:33:05 -0700 (PDT) Date: Wed, 26 Sep 2012 23:33:51 +0400 From: Valentine Barshak To: buildroot@busybox.net Message-ID: <20120926193351.GA3971@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20120926193155.GA3942@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) Subject: [Buildroot] [PATCH 2/3] libdvdnav: Fix dvdnav-config X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Valentine Barshak 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 fixes path prefix in the staging dvdnav-config and removes dvdnav-config from the target filesystem if BR2_HAVE_DEVFILES is not set. Signed-off-by: Valentine Barshak --- package/libdvdnav/libdvdnav.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/package/libdvdnav/libdvdnav.mk b/package/libdvdnav/libdvdnav.mk index e2d42f3..2fefe43 100644 --- a/package/libdvdnav/libdvdnav.mk +++ b/package/libdvdnav/libdvdnav.mk @@ -16,4 +16,18 @@ LIBDVDNAV_DEPENDENCIES = libdvdread host-pkg-config # of cross compilation, we prefer using pkg-config. LIBDVDNAV_CONF_OPT = --with-dvdread-config="$(PKG_CONFIG_HOST_BINARY) dvdread" +define LIBDVDNAV_TARGET_CLEANUP + $(RM) -f $(TARGET_DIR)/usr/bin/dvdnav-config +endef + +ifneq ($(BR2_HAVE_DEVFILES),y) +LIBDVDNAV_POST_INSTALL_TARGET_HOOKS += LIBDVDNAV_TARGET_CLEANUP +endif + +define LIBDVDNAV_STAGING_FIXUP_DVDNAV_CONFIG + $(SED) "s,prefix=/usr,prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/bin/dvdnav-config +endef + +LIBDVDNAV_POST_INSTALL_STAGING_HOOKS += LIBDVDNAV_STAGING_FIXUP_DVDNAV_CONFIG + $(eval $(autotools-package))