From patchwork Mon Jul 27 20:32:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1337288 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.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=free.fr 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=YoVGNaW+; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BFs2d0xLBz9sRN for ; Tue, 28 Jul 2020 06:33:29 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 8EB33882F8; Mon, 27 Jul 2020 20:33:27 +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 8X7rklwK3SEi; Mon, 27 Jul 2020 20:33:27 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id A80A188301; Mon, 27 Jul 2020 20:33:26 +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 BDE291BF973 for ; Mon, 27 Jul 2020 20:33:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id BA88387742 for ; Mon, 27 Jul 2020 20:33:11 +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 JzoOfPWlg69H for ; Mon, 27 Jul 2020 20:33:10 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by whitealder.osuosl.org (Postfix) with ESMTPS id 98CF086E1F for ; Mon, 27 Jul 2020 20:33:10 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id r4so13183123wrx.9 for ; Mon, 27 Jul 2020 13:33:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VNJAFw7manfquReGWquEGAa0JrZ6njFPTVk2EYv4a/A=; b=YoVGNaW+mxiLzliPvJ7J2YEb0XqQZ15pv0ZyAMJ1dYt8AcNyoDFQlbrHwuqXlrJwR3 KVhnoo/hy6ilhIgb8g9jXbz/wW353GsXI1WBszFS44DBMLhc9QfNz0TnTC77m7QEoBG2 CUn+DNI7xnEJFkT3To3bgb7MrmFX8p8XrCIQu89io3zYVi9yvkfhA4TZMmoQ348S2MKX E8V3825Mj8f7tsPniX9W+0wL2bQgmSb1s6pqCyv3oCV9Orvi6F93ZrOYKS+LpxLQ7zyG qw0ht2KEF8jx0yeFeJj72J+Z3zqpsUiVce9EEA+ox0s1SD/tvgNuoHbFV/xZMKEnxEFq bf1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=VNJAFw7manfquReGWquEGAa0JrZ6njFPTVk2EYv4a/A=; b=pC1MqYetTtH5XUnYJevoRMREKiwM8/+SHyRfFRE1AxeuG7EtOSjvBJ2TEqj2uxOmmU dMLFSJke15ZMXvaS5exBRPu9aL0zTuD+2Yd7ONvPdflpgzi0ON7PeW1mNdufYjabtGEJ 8TMAV+dfdq5lvjHOG1IJO985Mf+zSiQTE0deV234JzCqotIy+Dw9w5u9ZibfpmSdlCJQ TWSRvkEEbNnZyZWbwnIsfYikvw+gUzNQZ9672GFCbhkGpzNposdiXAVFCB23LLxuUqnH i6fGz0Lq6hFqzCxIla+TOKmtwnYuPjRNEzxzO/ttnOACdwUl10/kL7cteZ3OOkvqXNmG Du4Q== X-Gm-Message-State: AOAM532QrZ8ZmxEkBNRn6WPLbG2cTFJwy8fm7fmzib7+yi9azPijra99 GU5d9Eym8DNncivjh78XVgkblLYd X-Google-Smtp-Source: ABdhPJyRvBDCph5HWmrjMNOxhbwK16T3laQDyE6DkTmNkfpnoHf5OfWILd21Nyx1V38SNcxf9xXG/w== X-Received: by 2002:a5d:43ca:: with SMTP id v10mr21601678wrr.299.1595881988786; Mon, 27 Jul 2020 13:33:08 -0700 (PDT) Received: from scaer.home ([2a01:cb19:8b51:cb00:d4f:d67b:e735:cdab]) by smtp.gmail.com with ESMTPSA id j11sm13888159wrq.69.2020.07.27.13.33.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jul 2020 13:33:08 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Mon, 27 Jul 2020 22:32:59 +0200 Message-Id: <053f9c5849edf7a5646862c1c7ad6c87007ebdc2.1595881971.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [Buildroot] [PATCH 8/9 v2] package/solarus: depend on lua ABI version 5.1 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: James Hilliard , "Yann E . MORIN" Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: James Hilliard Since solarus is compatible with lua interpreters that provide the version 5.1 ABI we should depend on that instead of unconditionally selecting luajit. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/solarus/Config.in | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/package/solarus/Config.in b/package/solarus/Config.in index 5d15342f3a..cdff62687f 100644 --- a/package/solarus/Config.in +++ b/package/solarus/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_SOLARUS bool "solarus" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS + depends on BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # openal @@ -12,7 +12,6 @@ config BR2_PACKAGE_SOLARUS select BR2_PACKAGE_LIBOGG select BR2_PACKAGE_LIBPNG # runtime select BR2_PACKAGE_LIBVORBIS - select BR2_PACKAGE_LUAJIT if !BR2_PACKAGE_LUA_5_1 select BR2_PACKAGE_OPENAL select BR2_PACKAGE_PHYSFS select BR2_PACKAGE_SDL2 @@ -26,8 +25,8 @@ config BR2_PACKAGE_SOLARUS http://www.solarus-games.org https://github.com/solarus-games/solarus -comment "solarus needs OpenGL and a toolchain w/ C++, gcc >= 4.8, NPTL, dynamic library" - depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS || BR2_PACKAGE_LUA_5_1 +comment "solarus needs OpenGL and a toolchain w/ C++, gcc >= 4.8, NPTL, dynamic library, and luajit or lua 5.1" + depends on !BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \