From patchwork Tue Mar 20 02:04:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 132107 Delivered-To: patches@linaro.org Received: by 10.46.84.29 with SMTP id i29csp286027ljb; Mon, 19 Mar 2018 19:04:56 -0700 (PDT) X-Received: by 10.99.112.92 with SMTP id a28mr10521345pgn.17.1521511496162; Mon, 19 Mar 2018 19:04:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521511496; cv=none; d=google.com; s=arc-20160816; b=CnXHEVLWFVNjdRVAS0TpiM7Z+aSyEKkgEZTGqkqe69B8q3FGXSwuLStPQHd/4uWMik V8CBmkL3fyW84jjv/BV8rhUbdaHkRsnnW3j1onANARzz9mrtHNPbnJgc6dkQXdumODX1 DHpAWr7sFuWqcLjiHoO+DIcwSQgNl6v6aEVTFi2v8A4DXMNue2gdgFM5ObdnEi8xj6aU IcQi8goAhLJA6fLcP3DRqWjb2V6YVDTnaqpxGQqI65OAz75j7YrXyIgSwcxEDGXUQhPd RVO12aQ6dxIfJ6hIs83OlD6W8/1SgJT9DkF72ukQEacNxRBSnMw4DJZMqE329IMbu4B1 mX5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=lsB7E/+RiHnc7PgUdRgxWMLVdqH3x1hyqlZ2bYU7P94=; b=w97h8h1CUY43ueDDul31olD4hVSXyQQ9+XQD5pLVZxBDX72259rEBi5+I7aA82PIIW zaSEWRkcU7d0lyTQt2NhNNr8olIfQ65EQsxbYvKHtUDCgyUmOd1my//t+ejlgpcn3zJr GDtQkIslwf9nUs/mhIAe9ZIwhx5tlbpbsPC3C+NsFYbjfcTktEVgNKSCRlIh4ATam3W2 Gk9vqliCF+hAjHhfTHiRAK8XePxE5f/9EM/vyLwTOUYNaDT1K80AFN3kdNU9h+WXEX4W 7I0EuxAF6CMYmDPmg0ozVwhI1UqYZcU+SANI529bhjpQt4kYz8ouG+lZBb30A6VuK4Le zcUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KReWeied; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id w18-v6sor244923pll.127.2018.03.19.19.04.55 for (Google Transport Security); Mon, 19 Mar 2018 19:04:56 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KReWeied; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=lsB7E/+RiHnc7PgUdRgxWMLVdqH3x1hyqlZ2bYU7P94=; b=KReWeiedTeRBq5GE7pkOb3buUxHEBmNX5kfWoJTC4me8ZXAVpPLQbseuh1OGIhQGOJ KaKMULmqEUhZhd07IOp+Gq1XfzelR9SRbfkgZfkHIXeZ7ukJGrJw/YFF70/BUxtkB37g 9854oGAAPD3ChUN61MzDEW4+8NjmvxFFxvghU= 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; bh=lsB7E/+RiHnc7PgUdRgxWMLVdqH3x1hyqlZ2bYU7P94=; b=OdWQbovJ8KWYCtYBhzTkF5+uZ7Gn5at+hoisq2jOLMir0RZoWOBsvyGbcrT/zU5OFq Zy2gFSotQW9oYgGd+ZdqRjW3myR2N2MA/nn5VE1d6r3BcCYfZE9SsDGxiR2ojFeqtzNQ QobnFG0tjgR+fyqy3sICKfPbbqF37C5Kn36CpppxcPRS3qXPRPQuyBpOz5WWjKMXCUrL vFMtaARmIN6rj8nDfbOo0+WLHwjs/8aqEW/jdVYIzJ/5MEqNQ5hVgW2Di06eRmkKIZyS 9v+OB4Y/I9yJgc3jwDaiFVRtVGQavQ6AnqUI+NZj9M3qYc+JguKc0/W6l4/+LpmC8qjN kBhA== X-Gm-Message-State: AElRT7E+V3WJElE7VQE1qT9oqc2jvjO5VLS9y++Le430/wFNAXJ1W6Cb dNVbmf1U7TqnF127NycfWj3UPilF X-Google-Smtp-Source: AG47ELsMfrp85cL2kGj0wJK1EK61WEfayDGOzGUonFE3PQpw3RKzuBzol6FsaNYqV7vgs11m4KT5+g== X-Received: by 2002:a17:902:b095:: with SMTP id p21-v6mr14490501plr.235.1521511495520; Mon, 19 Mar 2018 19:04:55 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:600:5100:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id c67sm651640pfl.106.2018.03.19.19.04.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 19 Mar 2018 19:04:54 -0700 (PDT) From: John Stultz To: dri-devel Cc: John Stultz , Rob Herring , Sean Paul , Robert Foss , Emil Velikov , Tomasz Figa , Marissa Wall , Dan Willemsen Subject: [RFC][PATCH] libdrm: intel/Android.mk: Limit x86/x86_64 filtering to just libpciaccess Date: Mon, 19 Mar 2018 19:04:48 -0700 Message-Id: <1521511488-8938-1-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In ed07718ae7ba ("libdrm: intel/Android.mk: Filter libdrm_intel library requirements on x86/x86_64"), I avoided including the logic from intel/Android.mk on non-x86 based builds. This was done to avoid the inclusion of the libpciaccess library as a build requirement. As a side effect, it removed the libdrm_intel target. This then caused trouble on non-x86 builds that use mesa3d, as its Android.mk files include the libdrm_intel as a build target. So instead of removing everything, this patch fixes the previous change to just remove the libpciaccess library as a build dependency on non-x86 builds. Validated on both hikey960 (no mesa3d) and db410c (with mesa3d) builds. Cc: Rob Herring Cc: Sean Paul Cc: Robert Foss Cc: Emil Velikov Cc: Tomasz Figa Cc: Marissa Wall Cc: Dan Willemsen Fixes: ed07718ae7ba ("libdrm: intel/Android.mk: Filter libdrm_intel library requirements on x86/x86_64") Reported-by: Stefan Schake Signed-off-by: John Stultz --- intel/Android.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) -- 2.7.4 diff --git a/intel/Android.mk b/intel/Android.mk index 3f9db78..5e144f8 100644 --- a/intel/Android.mk +++ b/intel/Android.mk @@ -21,7 +21,6 @@ # IN THE SOFTWARE. # -ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64)) LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) @@ -33,9 +32,12 @@ LOCAL_MODULE := libdrm_intel LOCAL_SRC_FILES := $(LIBDRM_INTEL_FILES) LOCAL_SHARED_LIBRARIES := \ - libdrm \ + libdrm + +ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64)) + LOCAL_SHARED_LIBRARIES += \ libpciaccess +endif include $(LIBDRM_COMMON_MK) include $(BUILD_SHARED_LIBRARY) -endif