From patchwork Sat Oct 20 22:14:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 987261 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=bootlin.com 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 42cxsx0rMhz9sC2 for ; Sun, 21 Oct 2018 09:15:01 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 33D9287EBA; Sat, 20 Oct 2018 22:14:58 +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 mc8jL+rVwUt5; Sat, 20 Oct 2018 22:14:56 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 5C04287AF4; Sat, 20 Oct 2018 22:14:56 +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 AB5E91BF39A for ; Sat, 20 Oct 2018 22:14:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A80F887830 for ; Sat, 20 Oct 2018 22:14:48 +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 OK343Dr-sCF2 for ; Sat, 20 Oct 2018 22:14:48 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.bootlin.com (mail.bootlin.com [62.4.15.54]) by whitealder.osuosl.org (Postfix) with ESMTP id 055DC871EF for ; Sat, 20 Oct 2018 22:14:48 +0000 (UTC) Received: by mail.bootlin.com (Postfix, from userid 110) id CE1462072F; Sun, 21 Oct 2018 00:14:46 +0200 (CEST) Received: from localhost (unknown [31.185.52.13]) by mail.bootlin.com (Postfix) with ESMTPSA id 6F8D32072F; Sun, 21 Oct 2018 00:14:46 +0200 (CEST) From: Thomas Petazzoni To: Buildroot List , Valentin Korenblit , Romain Naour Date: Sun, 21 Oct 2018 00:14:35 +0200 Message-Id: <20181020221437.12687-5-thomas.petazzoni@bootlin.com> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20181020221437.12687-1-thomas.petazzoni@bootlin.com> References: <20181020221437.12687-1-thomas.petazzoni@bootlin.com> Subject: [Buildroot] [PATCH 4/6] package/nvidia-driver: use += where appropriate 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: Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Within the BR2_PACKAGE_NVIDIA_DRIVER_XORG condition, some "=" assignements are used for various variables, which are also appended in other conditions below in nvidia-driver.mk. It works fine because those assignements appear earlier in the .mk, but it is a bit error-prone, so let's use += when adding values to those variables. Signed-off-by: Thomas Petazzoni --- package/nvidia-driver/nvidia-driver.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nvidia-driver/nvidia-driver.mk b/package/nvidia-driver/nvidia-driver.mk index a595aed4f7..0d051fcaa4 100644 --- a/package/nvidia-driver/nvidia-driver.mk +++ b/package/nvidia-driver/nvidia-driver.mk @@ -20,8 +20,8 @@ ifeq ($(BR2_PACKAGE_NVIDIA_DRIVER_XORG),y) # are build dependencies of packages that depend on nvidia-driver, so # they should be built prior to those packages, and the only simple # way to do so is to make nvidia-driver depend on them. -NVIDIA_DRIVER_DEPENDENCIES = mesa3d-headers xlib_libX11 xlib_libXext -NVIDIA_DRIVER_PROVIDES = libgl libegl libgles +NVIDIA_DRIVER_DEPENDENCIES += mesa3d-headers xlib_libX11 xlib_libXext +NVIDIA_DRIVER_PROVIDES += libgl libegl libgles # libGL.so.$(NVIDIA_DRIVER_VERSION) is the legacy libGL.so library; it # has been replaced with libGL.so.1.0.0. Installing both is technically @@ -65,7 +65,7 @@ NVIDIA_DRIVER_LIBS_MISC = \ libvdpau_nvidia.so.$(NVIDIA_DRIVER_VERSION) \ libnvidia-ml.so.$(NVIDIA_DRIVER_VERSION) -NVIDIA_DRIVER_LIBS = \ +NVIDIA_DRIVER_LIBS += \ $(NVIDIA_DRIVER_LIBS_GL) \ $(NVIDIA_DRIVER_LIBS_EGL) \ $(NVIDIA_DRIVER_LIBS_GLES) \