From patchwork Thu Mar 8 19:15:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 883285 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="QMUs0Jpv"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zy0bQ50Wpz9sZv for ; Fri, 9 Mar 2018 06:15:46 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 6D3B98A189; Thu, 8 Mar 2018 19:15:42 +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 aO-o3Lm57537; Thu, 8 Mar 2018 19:15:40 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 23EDF8A158; Thu, 8 Mar 2018 19:15:40 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 2A9C21C03E8 for ; Thu, 8 Mar 2018 19:15:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 266B32F064 for ; Thu, 8 Mar 2018 19:15:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OkYrSWtvTjby for ; Thu, 8 Mar 2018 19:15:37 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by silver.osuosl.org (Postfix) with ESMTPS id 466AA2ECCF for ; Thu, 8 Mar 2018 19:15:37 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id e194so1314717wmd.3 for ; Thu, 08 Mar 2018 11:15:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=DMJ1zSBr7oqG3RgzgBhBF/NpZjL/BI/3B+FbkF8LtIg=; b=QMUs0JpvKAMUl27+XkFqr1279a0C6f/tLAex41LrQyEYTvts6YxvykedhoWAUHX0EU 7VK+bKWXV14PonKHvTIYJOEXKfVumP7spQ3HvSAfMqmdnlegMeKWEZennxXlZIMo2dS1 t5aLeqe0jeovEoOqwNaiF2xtPbQKTTQo1mhYeaxje15IjxuvrAF9wpI2n13u1sa9ah5L 6PkMXWar+fDfUWSw/1mpUwGzZz0dR+dJexv8SR/nJCRbMGeTJeCHEwaAO78ICoq9LhSx jRKBkjG1KyM7NhmEjtJuvMa9XpDZfotngVLpkUZCms+j/c7Y4lXaIa4uRoELC+3yaZKc +6Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=DMJ1zSBr7oqG3RgzgBhBF/NpZjL/BI/3B+FbkF8LtIg=; b=NIWKQRmA77qtlb3FbC2MIq+wZV0LICsCsVmhehhjS1JiJ1mU8KBi6DkTICfh1GV7BH k8NGZ13Xxm1gNHcuj1vDYCMCfzPfbafCzpTlbaQbNqnvQtkDFMC0g2+MXIJB22T0K5/i VH8Jy1OpGUPXJZwiW9qqfqJtfrK6DQ/hoN1yPzRlyd8xAI/UKz+nHqOcd6pO9V5oQRuS exn2G2id2N4DCJHki9GO+IsUCbRcvxae3ARqeZcEYDfQSl41xi5L74ePYRTGmDU3Xh/a tPehS0pGiQu7W5MrqQ7D7lEmbAK4Q8p119BNVoetE0g4wOZdkLhm+p1VyZpnNfp2o8zO Dnpg== X-Gm-Message-State: AElRT7GE1zYPZTmn0FteCClwyz1m7P5XEAqgjhqPLZOK04S0aTUn7w8p 0iNuk3GbGEKWG6Y6Qxt8otnjFQ== X-Google-Smtp-Source: AG47ELtrIrf9oY+RO6+liQaQ+WIxFgUyiptkCms26WiuotWElGICs5vuCvxkGp3YKof7eDKNZl7PUw== X-Received: by 10.28.181.134 with SMTP id e128mr6371929wmf.57.1520536534778; Thu, 08 Mar 2018 11:15:34 -0800 (PST) Received: from fabrice-VirtualBox.home (ARennes-656-1-229-26.w2-14.abo.wanadoo.fr. [2.14.45.26]) by smtp.gmail.com with ESMTPSA id g52sm40726309wra.20.2018.03.08.11.15.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Mar 2018 11:15:33 -0800 (PST) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Thu, 8 Mar 2018 20:15:27 +0100 Message-Id: <20180308191527.5946-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [Buildroot] [PATCH v2,1/1] libmpdclient: fix install X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" meson adds the build machine architecture for installation, see: https://github.com/mesonbuild/meson/issues/2535 Until this is fixed, fix libmpdclient.pc and copy the libraries and libmpclient.pc to the correct place. Without this fix, ympd does not find libmpdclient Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Fix install of libmpdclient.pc package/libmpdclient/libmpdclient.mk | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/package/libmpdclient/libmpdclient.mk b/package/libmpdclient/libmpdclient.mk index 5574bde948..8a47812836 100644 --- a/package/libmpdclient/libmpdclient.mk +++ b/package/libmpdclient/libmpdclient.mk @@ -34,9 +34,34 @@ define LIBMPDCLIENT_INSTALL_TARGET_CMDS ninja $(LIBMPDCLIENT_NINJA_OPTS) -C $(@D)/build install endef +# meson adds the build machine architecture for installation, see: +# https://github.com/mesonbuild/meson/issues/2535 +# Until this is fixed, copy the libraries to the correct place +define LIBMPDCLIENT_FIX_LIBRARY_INSTALL_TARGET + cp -a $(@D)/build/libmpdclient.* $(TARGET_DIR)/usr/lib +endef + +LIBMPDCLIENT_POST_INSTALL_TARGET_HOOKS += \ + LIBMPDCLIENT_FIX_LIBRARY_INSTALL_TARGET + define LIBMPDCLIENT_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) \ ninja $(LIBMPDCLIENT_NINJA_OPTS) -C $(@D)/build install endef +# meson adds the build machine architecture for installation, see: +# https://github.com/mesonbuild/meson/issues/2535 +# Until this is fixed, fix libmpdclient.pc and copy the libraries and +# libmpclient.pc to the correct place +define LIBMPDCLIENT_FIX_LIBRARY_INSTALL_STAGING + $(INSTALL) -D -m 644 $(@D)/build/meson-private/libmpdclient.pc \ + $(STAGING_DIR)/usr/lib/pkgconfig/libmpdclient.pc + $(SED) 's,^libdir=.*,libdir=$${prefix}/lib,' \ + $(STAGING_DIR)/usr/lib/pkgconfig/libmpdclient.pc + cp -a $(@D)/build/libmpdclient.* $(STAGING_DIR)/usr/lib +endef + +LIBMPDCLIENT_POST_INSTALL_STAGING_HOOKS += \ + LIBMPDCLIENT_FIX_LIBRARY_INSTALL_STAGING + $(eval $(generic-package))