From patchwork Sat Jul 21 16:27:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 142500 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4234377ljj; Sat, 21 Jul 2018 09:30:11 -0700 (PDT) X-Google-Smtp-Source: AAOMgpetsAgqm4RR+R8/+AGidbJTQwjXNbDmof/0+hXUWMfqkINswC3bKx4wgv57OBIhN6Edq8m3 X-Received: by 2002:a63:383:: with SMTP id 125-v6mr6208576pgd.421.1532190611209; Sat, 21 Jul 2018 09:30:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532190611; cv=none; d=google.com; s=arc-20160816; b=S2F2JFlQALF07d/Rr+dW+uhn5LW/3LDQ2Lo8sKdTYjIpTtBumNdf99vhypfk4uGo1Z qANLRmtIuQQbKMIKSQ7NzvrVFbY+1j4CN8XfNjsqmpurGDHw8u+iwgjJ2MdVb6uValxb Nf7DPEF3uCTHd4UgY2940OpAqOgfGyeAunV+jSag6sncQBC6da/1dgzN0N+WYrD8IeMS g/rzYc9URFL7Xwv6SLlTlburn4LT6E7PQu4st9FmcLpewSR4NCQ4Om/6uTorDmdyHSKM WDqcPyIYCX1UdOAelrqB8K4b5FrQn2cVwscfPuXs19LYxS8ArnSRvdfZRJzTRIxo/o1Y 0/4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=htv0w1+lAZHZuhvsfdnXoo7HdX3eDwK6Nl2hJiWT+YA=; b=vCgW8T56SNE03lQyppFtbd4ICLtUY88jwOtZx0jSoHaL6LRAnZkypMID2BBQTpHyGy dukkNwLk73TAfVp1acM+75SGZTHwQ7zxWfx6HTufgjksjILrbY9qL9ZRrSlvvr31AqFb H5/TDkl7ZUDjckU5M2PVCMBqN1UNfELEgQSD1RwUdgY2cdkQDr+vJZpXsDmMCWz+7Xzh 1gGudjkmrCMz6ys+KVAO46JNoWHbxKImqf1IdDM9hAfgWZVyNLhNfEvQkvR8e5JtxfOt X/AQT9rnzd/B2DtYB+/v4q3v2YrI05kXNiIs35MpN/NuP1Igf12KmkZVez6d7DAEyO2T zQBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=nSgDiBfV; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id 83-v6si4574170pgg.663.2018.07.21.09.30.10; Sat, 21 Jul 2018 09:30:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=nSgDiBfV; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 1BCB378B21; Sat, 21 Jul 2018 16:30:08 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pl0-f48.google.com (mail-pl0-f48.google.com [209.85.160.48]) by mail.openembedded.org (Postfix) with ESMTP id E8BFF78AF7 for ; Sat, 21 Jul 2018 16:27:26 +0000 (UTC) Received: by mail-pl0-f48.google.com with SMTP id w8-v6so6451007ply.8 for ; Sat, 21 Jul 2018 09:27:28 -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; bh=6DOJPl06VMYxzDNtPCRFbTNcxcZDXdeH+JA7vQqQ4UM=; b=nSgDiBfVIzwNVVF50QJG82ar8PUxgoeA/FFyWKZXb9nm7OJkhu/hQFrkwEA03TQLr9 rUiLFkPP2bI1MTOlot1JKo61Z91Vmq1sqzBblfzy6YFpVVuRVO8t9JeB9g7ewoP9oXCf B+/b1IalkQfjL8itNUQkbn/5X/Zl0zO43PmcTag+0q2Oscg++GE5zpsSi/cb3aDu6us1 XHGvvea+P1M1LZXGSkC+9FEpn/brQDATVihvht0KoIhxPPUWSXKn+IVUya+I2IqMk9pQ E4coImVLQtq91dhiw0UYBMw/szfgYv6T2BnqQNDXaquP3DewW+y6jFhi9UhAE4ubEoyd t13w== 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; bh=6DOJPl06VMYxzDNtPCRFbTNcxcZDXdeH+JA7vQqQ4UM=; b=mBSHBYYd2A0+jK6zvwfxruija7ZQYpTgMSokqj0eLt3eufDMuOpGxrZ/8tK8qjfujS ipzg2LAQ4tHUKqHFIrbjPVYH1OSPuWwhRk86kA8JllPbYKBPlATGoCpuyBgMNLX7DiCO mpZPaQnMpZaI5q8ZW5ZX2Fqi73USeRTRajttesL9WwCmxlEDfVD78TK9g1ejdbALpQpS sr7QTZSVxHrePTK91Xl2qtVXlJnePimWlFFcEMIThWBKyLwU++UXViw//EgLLpJwmGVP 1+LgBFFrjTjWVvas0EBZWk+PqQexwMwvnZleZByTUTLkTAuDNIcqKDX5I/pzEdF7Ip+Z Z5Bw== X-Gm-Message-State: AOUpUlFonPN9Movlw6Nl4Tk/WJ7TD+w3Fr5hpn96YGGtPUREu5506+z8 /vq/Ds42weDCuKShfGx3iOLr2tLd X-Received: by 2002:a17:902:ac1:: with SMTP id 59-v6mr6282012plp.36.1532190447678; Sat, 21 Jul 2018 09:27:27 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::8092]) by smtp.gmail.com with ESMTPSA id k26-v6sm14485231pfb.167.2018.07.21.09.27.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Jul 2018 09:27:26 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Sat, 21 Jul 2018 09:27:11 -0700 Message-Id: <20180721162715.12611-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180721162715.12611-1-raj.khem@gmail.com> References: <20180721162715.12611-1-raj.khem@gmail.com> Subject: [OE-core] [PATCH 3/7] libsdl2: Find wayland-protocol files in proper location during cross compile X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Fixes | /bin/sh ../SDL2-2.0.8/build-scripts/mkinstalldirs build | make: *** No rule to make target '//usr/share/wayland/wayland.xml', needed by 'gen/wayland-client-protocol.h'. Stop. | make: *** Waiting for unfinished jobs.... | mkdir -p -- build | ERROR: oe_runmake failed Signed-off-by: Khem Raj --- ...R-for-defining-WAYLAND_PROTOCOLS_DIR.patch | 34 +++++++++++++++++++ .../recipes-graphics/libsdl2/libsdl2_2.0.8.bb | 7 +++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/libsdl2/libsdl2/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DIR.patch -- 2.18.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-graphics/libsdl2/libsdl2/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DIR.patch b/meta/recipes-graphics/libsdl2/libsdl2/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DIR.patch new file mode 100644 index 0000000000..f9a666e755 --- /dev/null +++ b/meta/recipes-graphics/libsdl2/libsdl2/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DIR.patch @@ -0,0 +1,34 @@ +From 07ef55d0fd9f53a4d94ed8df03ac5ef7d3cbf2d2 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 20 Jul 2018 22:51:32 -0700 +Subject: [PATCH] use PKG_CHECK_VAR for defining WAYLAND_PROTOCOLS_DIR + +This allows to override the wayland-protocols pkgdatadir with the +WAYLAND_PROTOCOLS_DIR from environment. + +pkgconfig would return an absolute path in /usr/share/wayland-protocols +for the pkgdatadir value, which is not suitable for cross-compiling. + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + .../libsdl2/2.0.8-r0/SDL2-2.0.8/configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: SDL2-2.0.8/configure.in +=================================================================== +--- SDL2-2.0.8.orig/configure.in ++++ SDL2-2.0.8/configure.in +@@ -1395,9 +1395,9 @@ AC_HELP_STRING([--enable-video-wayland-q + if $PKG_CONFIG --exists wayland-client wayland-scanner wayland-protocols wayland-egl wayland-cursor egl xkbcommon ; then + WAYLAND_CFLAGS=`$PKG_CONFIG --cflags wayland-client wayland-egl wayland-cursor xkbcommon` + WAYLAND_LIBS=`$PKG_CONFIG --libs wayland-client wayland-egl wayland-cursor xkbcommon` +- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner` +- WAYLAND_CORE_PROTOCOL_DIR=`$PKG_CONFIG --variable=pkgdatadir wayland-client` +- WAYLAND_PROTOCOLS_DIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` ++ PKG_CHECK_VAR(WAYLAND_SCANNER, wayland-scanner, wayland_scanner) ++ PKG_CHECK_VAR(WAYLAND_CORE_PROTOCOL_DIR, wayland-client, pkgdatadir) ++ PKG_CHECK_VAR(WAYLAND_PROTOCOLS_DIR, wayland-protocols, pkgdatadir) + video_wayland=yes + fi + fi diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.8.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.8.bb index accea38aaa..a8d2283fde 100644 --- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.8.bb +++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.8.bb @@ -14,7 +14,8 @@ PROVIDES = "virtual/libsdl2" SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \ file://more-gen-depends.patch \ -" + file://0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DIR.patch \ + " S = "${WORKDIR}/SDL2-${PV}" @@ -29,6 +30,7 @@ EXTRA_OECONF = "--disable-oss --disable-esd --disable-arts \ --enable-pthreads \ --enable-sdl-dlopen \ --disable-rpath \ + --disable-wayland-shared \ " # opengl packageconfig factored out to make it easy for distros @@ -53,6 +55,9 @@ PACKAGECONFIG[x11] = "--enable-video-x11,--disable-video-x11,virtual/libx EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader" +export WAYLAND_PROTOCOLS_DIR="${STAGING_DATADIR}/wayland-protocols" +export WAYLAND_CORE_PROTOCOL_DIR="${STAGING_DATADIR}/wayland" + do_configure_prepend() { # Remove old libtool macros. MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"