From patchwork Tue May 9 07:57:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 98879 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp1699597qge; Tue, 9 May 2017 00:58:43 -0700 (PDT) X-Received: by 10.98.214.90 with SMTP id r87mr24980508pfg.204.1494316723349; Tue, 09 May 2017 00:58:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494316723; cv=none; d=google.com; s=arc-20160816; b=0ox5PDAG2yWlsqEfFrz8t4TDfElYYAdZHi371MXikd1HEoGz3WbFckxobKjemBmV2w Pwr9oiYzj74hmHOGk9k4LiyVt7OCjSS+T0l8mJbsnewg7j8BgzjCF/GjRM7dSGcSb+cU cHy/BSCDVZmz7ahYW3VC/1+a4xMav62X+IIolXEF8/deu4MBYhwV810iJ4pqhp8d6aso kQzvHTspVfWCPIwg23pArnbrOPMgxqlQj3AciVRB0B30qsq1XRo39S07n8qyJ16vMZK8 9MgkZAW6lZEV66MHZbrA7fQ/dymECctmmirOLWB2FDWR0PHWkaPlBts2QtF02yP9HqdX IGxQ== 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=UPNYnaQ1468QDwDT1EkfLbIKORgLtzzVarRhk/jwJzs=; b=RflhxlxE0T3qW5Hb6u3YZl4rgfEserFJefmQlfRtvaR2t8TP+rNSmLOI7jr4ok8RR2 Mf8RhZ1C7CbaBwl7BHNW8HO21xPbqiiXM2c3Uk04KtIoxYoQY9FcRSpA2jd4k/StX1ul A9srj+RWKGYN2tcmnVXuGigD02XnA4CIYyCuYz/LUHXaZHZdU5bLEeKHM4NG1mSu03/f 5wirYIroikrJTNqIFbprx63RMGWH4vr7dyscDKTeh2T93fjlKXQZt1hIvV8F5CcM0Bh9 aBo1BmYP0BY2yxXQChaQUVDrExI263WjQWIGvQFni34vGXOv9fIUbdYLwkwQco0evf4l Eg1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE 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 89si5094215pld.33.2017.05.09.00.58.43; Tue, 09 May 2017 00:58:43 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-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; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 8CEFE71BD4; Tue, 9 May 2017 07:58:11 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f195.google.com (mail-pf0-f195.google.com [209.85.192.195]) by mail.openembedded.org (Postfix) with ESMTP id 44B3771A91 for ; Tue, 9 May 2017 07:57:29 +0000 (UTC) Received: by mail-pf0-f195.google.com with SMTP id v14so12830366pfd.3 for ; Tue, 09 May 2017 00:57:31 -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=sJDtEc6NWL6/qlqhqvYh0gFFK51TNHQWuJM0DgVHRj8=; b=BpSEPIvOWRsJL90MmTrn/+iJTF/k63NmY9EoPVmfXB2rkitMBsNC7eqmAKKaqIKzA3 W4Tt9E7Act6OngPvxW6qA83PjilUo+7JZAlcmXCVaevrqNXcCy4WB4P7BZAIZ4dUfAXC SxXGS4QHWJcm72mtVUyuiv8CtvkY6ACZbIrZEVG1NTpZodK+vceC9+j3CIriNUZEGJH+ cicyKZ4BUXhpVYaUERwkwWg9YpANg1r8SBvWOZfGpbEAaeAzhPj4WgG8gnAp+7WLbjiJ QXpC4vZp5YPNMn+aGvNp6VaD2Af11n9+cqAKAwxWYr1XnwqCvkHIilPTArshBPlKn016 9ANQ== 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=sJDtEc6NWL6/qlqhqvYh0gFFK51TNHQWuJM0DgVHRj8=; b=QYGTJCeqfEcJ2u38dHMhFA6OcWgQESPGoMWMYOsX5lXJMP9/UbQq62hXBLdYkBb+rO VEc9QvDxYn8NH55XOQCDsgoRnkfzP35eGu5xrg3wpfX7vVe27HAjUoivudJzjKwZt+2b LtsH1dXyK9l4K7Y244QVsZD6EzcbSO+WtgKAPevsxmAz91unoHkj4f/4/4cNEZPLCEHn 3tpKXi7r85NfNdFdHYvmJMPB0qgl5lKH+M/flLcaNggUEl26vXmesTdz8Tomrt9lLeI1 NQnbeoK2VQxrqLJii3J+Hz6jdXYAZslRKerAb8AXdow7FSQUNdBc+CGkAlNdlEIyP8SL 4oQQ== X-Gm-Message-State: AN3rC/7bh2orRR2lNb62iH81aBMPpIjbWgUdeZq4X9aeN057Vf3MpRqK 7AHwrNDMo72Jew== X-Received: by 10.84.248.12 with SMTP id p12mr28160194pll.155.1494316651333; Tue, 09 May 2017 00:57:31 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::c232]) by smtp.gmail.com with ESMTPSA id i67sm20250916pfk.87.2017.05.09.00.57.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 May 2017 00:57:30 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Tue, 9 May 2017 00:57:10 -0700 Message-Id: <20170509075711.1575-8-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170509075711.1575-1-raj.khem@gmail.com> References: <20170509075711.1575-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 8/9] libsdl2-ttf: Check for x11 and opengl in distro features X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org when X11 is not in distro features it tries to link with libGL which does not exist and compile fails Add a patch to add foreign option to AUTOMAKE_OPTIONS which lets it configure and relax automake rules to not check for some GNU specific files Signed-off-by: Khem Raj --- .../recipes-support/libsdl-ttf/files/automake_foreign.patch | 13 +++++++++++++ meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf_2.0.14.bb | 11 +++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 meta-oe/recipes-support/libsdl-ttf/files/automake_foreign.patch -- 2.12.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-support/libsdl-ttf/files/automake_foreign.patch b/meta-oe/recipes-support/libsdl-ttf/files/automake_foreign.patch new file mode 100644 index 000000000..2d5bd6d91 --- /dev/null +++ b/meta-oe/recipes-support/libsdl-ttf/files/automake_foreign.patch @@ -0,0 +1,13 @@ +Index: SDL2_ttf-2.0.14/Makefile.am +=================================================================== +--- SDL2_ttf-2.0.14.orig/Makefile.am ++++ SDL2_ttf-2.0.14/Makefile.am +@@ -1,6 +1,8 @@ + # Makefile.am for the SDL truetype font loading library and viewer + lib_LTLIBRARIES = libSDL2_ttf.la + ++AUTOMAKE_OPTIONS = foreign ++ + libSDL2_ttfincludedir = $(includedir)/SDL2 + libSDL2_ttfinclude_HEADERS = \ + SDL_ttf.h diff --git a/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf_2.0.14.bb b/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf_2.0.14.bb index f2441f9cf..4601593ad 100644 --- a/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf_2.0.14.bb +++ b/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf_2.0.14.bb @@ -1,23 +1,25 @@ SUMMARY = "Simple DirectMedia Layer truetype font library" SECTION = "libs" -DEPENDS = "virtual/libsdl2 freetype" +DEPENDS = "virtual/libsdl2 freetype virtual/libgl" LICENSE = "Zlib" LIC_FILES_CHKSUM = "file://COPYING.txt;md5=cb33e7c4df9fbde389f149ad6bc93ce5" SRC_URI = " \ http://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-${PV}.tar.gz \ file://use.pkg-config.for.freetype2.patch \ + file://automake_foreign.patch \ " SRC_URI[md5sum] = "e53c05e1e7f1382c316afd6c763388b1" SRC_URI[sha256sum] = "34db5e20bcf64e7071fe9ae25acaa7d72bdc4f11ab3ce59acc768ab62fe39276" S = "${WORKDIR}/SDL2_ttf-${PV}" -inherit autotools pkgconfig +inherit autotools pkgconfig distro_features_check -do_configure_prepend() { - touch ${S}/NEWS ${S}/README ${S}/AUTHORS ${S}/ChangeLog +# links to libGL.so +REQUIRED_DISTRO_FEATURES += "x11 opengl" +do_configure_prepend() { # Removing these files fixes a libtool version mismatch. MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" @@ -25,3 +27,4 @@ do_configure_prepend() { rm -f ${S}/acinclude/$i done } +ASNEEDED = ""