From patchwork Fri Mar 27 18:29:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1262931 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.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.a=rsa-sha256 header.s=20161025 header.b=OTj+1pgN; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48pr4j0PFGz9sRN for ; Sat, 28 Mar 2020 05:30:13 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 987218869F; Fri, 27 Mar 2020 18:30:10 +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 QfKBY97PavcK; Fri, 27 Mar 2020 18:30:09 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 276A988686; Fri, 27 Mar 2020 18:30:09 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 5B7D11BF48B for ; Fri, 27 Mar 2020 18:30:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 58FE188681 for ; Fri, 27 Mar 2020 18:30:07 +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 BEZLY3aqa4Ed for ; Fri, 27 Mar 2020 18:30:06 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by whitealder.osuosl.org (Postfix) with ESMTPS id 2681A88686 for ; Fri, 27 Mar 2020 18:30:06 +0000 (UTC) Received: by mail-pg1-f194.google.com with SMTP id b22so4964141pgb.6 for ; Fri, 27 Mar 2020 11:30:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HNosdCEd3nPK0j/u1ORpodlhDel73E/IMAYqe/AQy8k=; b=OTj+1pgN6kd96Ha8DMW+n9fmVdfJCJrnMtEMhYULnQq5i/rkYuGOp3c/h80nqgkOg0 DB1MfZvtAGniHEvEzrrI1/McLQ//Mi3mHtzzSe3K7qKBoGerW/wurCvW7chdP1GYOtqX HjV3HaaQoxsDIqhv/YWurQnR3HF6OnB2dM7foKpFBHl/AHI/MQHS4oB1bsMLho3ZAzkN slWIuDEtGkjRJsEAn3Vwg89T2IAs7e+kLcO7bBj6tknhYdlMmtQVFV+J7epf3y9Up/da a3RG3idKStfURYp5wIBJceaxjQFHajr3Vv7fxQWq+GflXcb+7qX1jc6dWL39jLFwXBD/ Ff8Q== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=HNosdCEd3nPK0j/u1ORpodlhDel73E/IMAYqe/AQy8k=; b=S1XyFNNc/Cjjz7jg9yenbDbgWahZeX7KoGw6PO3x+6ggBYrhnmuKD59MAQq48WfRI/ /phxO+F0PeRJmKLfUP8+tyNY2iCY0Xn5m2GJHL4dNDs2c3rho3/GJK7c0Ubih/6xHhnw V7fly18MxTt6b+GdtkGXDdLz/jL3XYBpPxaRoFfEhvlE1SLm2V3g4XR4y/FCwgf3sIgv yq2dsgUrcSKhk3r/UKUw882sttoVimkgFkgP+OwbaZ6RsuDrswNux3fBquqLoWXOrZFu tut8gO4T/4hAFggR/Rk4Fi2oW3iCz/O2TP2y6A30Mv8uwqptzbLkT0kYS7bd+8UXbnrn 1pXQ== X-Gm-Message-State: ANhLgQ0rpIDDnovwHzFAfU5uRrc7Q8cfL/tXXI/94E2tTnVma+TDPPfi aAr/vaC5OmcE+1aouu6ovC9AiRDU X-Google-Smtp-Source: ADFU+vvC0MD6xghyg/LzbDlJYbC+YaWPizWj2LcZJJV0NzRGm5S97cb2mBWGDZFQdR0gOtgJOqtldw== X-Received: by 2002:a63:fc56:: with SMTP id r22mr592717pgk.147.1585333805336; Fri, 27 Mar 2020 11:30:05 -0700 (PDT) Received: from localhost.localdomain ([47.149.8.172]) by smtp.gmail.com with ESMTPSA id v123sm4594886pfv.146.2020.03.27.11.30.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2020 11:30:04 -0700 (PDT) From: aduskett@gmail.com To: buildroot@buildroot.org Date: Fri, 27 Mar 2020 11:29:55 -0700 Message-Id: <20200327183000.1005676-2-aduskett@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200327183000.1005676-1-aduskett@gmail.com> References: <20200327183000.1005676-1-aduskett@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 2/7] package/vala: install wrapper to vapigen X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine , Adam Duskett , Rahul Bedarkar Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Adam Duskett when compiling gobject-introspection .gir files, some packages use vapigen to generate a vala-api compatible .gir file. These packages tend to call vapigen directly instead of vala or valac. Without the wrapper, building the .gir files fail. In the case of for example, gupnp-dlna throws the following error: "error: Package `Gst-1.0' not found in specified Vala API directories or GObject-Introspection GIR directories." Installing the vala wrapper to vapigen fixes the above issue. Signed-off-by: Adam Duskett --- Changes v2 -> v3: - Add $(HOST_DIR)/bin/vapigen to the sed line. package/vala/vala.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package/vala/vala.mk b/package/vala/vala.mk index b8a69f8c5e..95365faf18 100644 --- a/package/vala/vala.mk +++ b/package/vala/vala.mk @@ -17,16 +17,19 @@ HOST_VALA_DEPENDENCIES = host-bison host-flex host-libglib2 HOST_VALA_CONF_ENV = ac_cv_path_XSLTPROC=: HOST_VALA_CONF_OPTS += --disable-valadoc -# We wrap vala & valac to point to the proper gir and vapi data dirs +# We wrap vala, valac and vapigen to point to the proper gir and vapi data dirs # Otherwise we'll get host directory data which isn't enough define HOST_VALA_INSTALL_WRAPPER $(INSTALL) -D -m 0755 package/vala/vala-wrapper \ $(HOST_DIR)/bin/vala $(INSTALL) -D -m 0755 package/vala/vala-wrapper \ $(HOST_DIR)/bin/valac + $(INSTALL) -D -m 0755 package/vala/vala-wrapper \ + $(HOST_DIR)/bin/vapigen $(SED) 's,@VALA_VERSION@,$(VALA_VERSION_MAJOR),' \ $(HOST_DIR)/bin/vala \ - $(HOST_DIR)/bin/valac + $(HOST_DIR)/bin/valac \ + $(HOST_DIR)/bin/vapigen endef HOST_VALA_POST_INSTALL_HOOKS += HOST_VALA_INSTALL_WRAPPER