From patchwork Sat May 23 09:44:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hilliard X-Patchwork-Id: 1296666 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.136; helo=silver.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=LChYxsVa; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49TdkV1qzmz9sRY for ; Sat, 23 May 2020 19:45:05 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 36BF320396; Sat, 23 May 2020 09:45:02 +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 jp-EWizPZKl3; Sat, 23 May 2020 09:45:00 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 7DA8420487; Sat, 23 May 2020 09:45:00 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 5DC151BF577 for ; Sat, 23 May 2020 09:44:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 57B0487400 for ; Sat, 23 May 2020 09:44:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yzGGz_kh67c1 for ; Sat, 23 May 2020 09:44:58 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-io1-f68.google.com (mail-io1-f68.google.com [209.85.166.68]) by fraxinus.osuosl.org (Postfix) with ESMTPS id B6E7A87375 for ; Sat, 23 May 2020 09:44:58 +0000 (UTC) Received: by mail-io1-f68.google.com with SMTP id p20so733543iop.11 for ; Sat, 23 May 2020 02:44:58 -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:mime-version :content-transfer-encoding; bh=ywMAc66I75L86cT5mOAhnN+7xdxU1/G3HMjGI/sqMzk=; b=LChYxsVaZ8I7Z7WWsisniBlOErEgyLa+qRiJ3DIFzJxlG4v9XOW/Aldye+LGkzIH29 U/QzXaSD9RQ5Cbloq4sbeEn7BetJPRuYEaoiBvgYCNIwPhhwvGGk/uMdAU19MeldhqAv 1yhJtleJXLOEearUVxgVYpGwi0rWpib788W351/eo+oLRLJoc+yAX23dD2X6NXZ3mVQ6 ewcrApB227h9be+kfJBPj981lFUjqbHzE0YSmMpwPWE7RNdoyu7wcx13QsPqhoRTznVJ B+0qvszd4bPVvOJjR4LLP3cgnc2kl1sCdE17ycWVfL6VhjBH+VI82VDS6pnmaS7lUaew YwmA== 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:mime-version :content-transfer-encoding; bh=ywMAc66I75L86cT5mOAhnN+7xdxU1/G3HMjGI/sqMzk=; b=WwNhLhzX+mi7dBWigTRUNROTmDhXgIqlZw4Yteg/CumyTnJbM7MjTsYnLSW3Rowmuw Cxu6Wopf13HuujYB3oTj/WDIzwhHid1+NcdkaNQ996yPLXUf1HrScVNAP7CBJL8jwEkM nodLNR1tLDfu8dhv/64UqFJFOgg+641z/NVtQsvahN1iusQ1UAHkef8jyKVkGKN42f7Y 7rpyBqOw4WrhQgdWOeaPHxESuWYXId87hV/ZG0he8iOAYcmaKlhFHOHDkhPDKiieuD41 sfJbobCCF7WSsBC5vW2IJS5Fehom2wqsXx2/+Zps+m28jrYOQqEARB4D9pO+Lnuckw90 eIiA== X-Gm-Message-State: AOAM530UhEVHsZzjw8/KE3eQ3ofa1i3dtw6oEvOcIBZlYLjdCbhBr2Jx 5wVtVhC8h5vkS7uenOgnLWJWpbhRt4Q= X-Google-Smtp-Source: ABdhPJzWpinTHLhRQERaFv7QAEzQH1Ku2AzYYfPr0UfGmnONWztRPwCd6At+ByxoTxc0+xpocwhoCg== X-Received: by 2002:a02:b149:: with SMTP id s9mr11616521jah.81.1590227097594; Sat, 23 May 2020 02:44:57 -0700 (PDT) Received: from james-x399.localdomain (71-218-100-23.hlrn.qwest.net. [71.218.100.23]) by smtp.gmail.com with ESMTPSA id o70sm3565116ilb.86.2020.05.23.02.44.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 May 2020 02:44:56 -0700 (PDT) From: James Hilliard To: buildroot@buildroot.org Date: Sat, 23 May 2020 03:44:52 -0600 Message-Id: <20200523094452.3821621-1-james.hilliard1@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 1/1] package/luajit: depend on !BR2_PACKAGE_LUA 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 , Romain Naour , Angelo Compagnucci Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The luajit package is incomaptible with lua so luajit should depend on !BR2_PACKAGE_LUA, propagate this dependency to packages selecting luajit. Signed-off-by: James Hilliard --- Changes v1 -> v2: - depend on !BR2_PACKAGE_LUA_5_3 instead of !BR2_PACKAGE_LUA for solarus --- package/efl/Config.in | 1 + package/luajit/Config.in | 1 + package/minetest/Config.in | 1 + package/solarus/Config.in | 1 + package/sysdig/Config.in | 1 + 5 files changed, 5 insertions(+) diff --git a/package/efl/Config.in b/package/efl/Config.in index ff49161163..c63633ffe4 100644 --- a/package/efl/Config.in +++ b/package/efl/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_EFL depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS # luajit + depends on !BR2_PACKAGE_LUA # luajit depends on BR2_TOOLCHAIN_HAS_THREADS # untested without threads depends on BR2_USE_MMU depends on BR2_USE_WCHAR # use wchar_t diff --git a/package/luajit/Config.in b/package/luajit/Config.in index f4d6001586..bb471b46b0 100644 --- a/package/luajit/Config.in +++ b/package/luajit/Config.in @@ -15,6 +15,7 @@ config BR2_PACKAGE_LUAJIT # Luajit is only available for some target architectures, and # has some complexity wrt 32/64. See luajit.mk for details. depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS + depends on !BR2_PACKAGE_LUA # luajit.mk uses the "-m32" compiler option to build 32bit # binaries, so check if that option is supported. See # luajit.mk for details. diff --git a/package/minetest/Config.in b/package/minetest/Config.in index 085525534d..880122ea84 100644 --- a/package/minetest/Config.in +++ b/package/minetest/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_MINETEST depends on BR2_PACKAGE_XORG7 # irrlicht depends on BR2_PACKAGE_HAS_LIBGL # irrlicht depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS + depends on !BR2_PACKAGE_LUA # luajit select BR2_PACKAGE_IRRLICHT select BR2_PACKAGE_GMP select BR2_PACKAGE_JSONCPP diff --git a/package/solarus/Config.in b/package/solarus/Config.in index 5d15342f3a..8a53f14d1f 100644 --- a/package/solarus/Config.in +++ b/package/solarus/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_SOLARUS bool "solarus" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS + depends on !BR2_PACKAGE_LUA_5_3 # luajit 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 diff --git a/package/sysdig/Config.in b/package/sysdig/Config.in index 0a1b3f8935..f2d2595a99 100644 --- a/package/sysdig/Config.in +++ b/package/sysdig/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_SYSDIG depends on BR2_LINUX_KERNEL depends on BR2_INSTALL_LIBSTDCPP # libjson depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS + depends on !BR2_PACKAGE_LUA # luajit depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on !BR2_STATIC_LIBS # luajit, elfutils depends on BR2_USE_WCHAR # elfutils