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: 10295903 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 044C0602BD for ; Tue, 20 Mar 2018 02:05:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E8C992958E for ; Tue, 20 Mar 2018 02:05:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DBC7629590; Tue, 20 Mar 2018 02:05:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 45E772958E for ; Tue, 20 Mar 2018 02:05:00 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 503516E6B1; Tue, 20 Mar 2018 02:04:58 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pl0-x242.google.com (mail-pl0-x242.google.com [IPv6:2607:f8b0:400e:c01::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id A0C7F6E6B1 for ; Tue, 20 Mar 2018 02:04:56 +0000 (UTC) Received: by mail-pl0-x242.google.com with SMTP id x4-v6so58673pln.7 for ; Mon, 19 Mar 2018 19:04:56 -0700 (PDT) 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=Wh2i5RY7aLpoRd2VksrXzYrsB48zYwPeFKvcMK930pXu7fE8pv3CPZynLL+ZI9eNkz oBbiOFYlOHx9c/1MlKp+JsfirAIQZGb08KL1w58Oj4oDyT+xxqOt5DW2Q0qXkkuwx6mY Zq/bswmcT4BaX9RcEXu4F1nhpEKfjdCsJ0wxsniqmFVUzGiyzH2559jcTDUNVezp6nxT yjcSY/4bPlqVlhOH6TKN+i6xIkNP66qVddiOoAlJIK9MgCLZY+BUY0Jp0rAmlDCJbY7o Y/zVmcOdrV6DCppS8R7nU3MRSMiAi0Fw/3zkNBA/TPRo+zb/RpZnudNPyr+YK2vbKAdK 6MGA== X-Gm-Message-State: AElRT7FZt92v8NCweKmonnehOOfZjzUcdbR4LwIZFvOtCM8RNYBazivp 1ZYgTYwt7umn6ckYSzrJZpXDDYjEdo4= 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) 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 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 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rob Herring , Sean Paul , Robert Foss , Emil Velikov , Tomasz Figa , Marissa Wall , Dan Willemsen MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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(-) 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