From patchwork Wed Jan 10 05:25:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 10154015 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 A2768602D8 for ; Wed, 10 Jan 2018 05:25:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 936AB20856 for ; Wed, 10 Jan 2018 05:25:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 870C2212E8; Wed, 10 Jan 2018 05:25:48 +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 C7F1D20856 for ; Wed, 10 Jan 2018 05:25:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 04B2E6E182; Wed, 10 Jan 2018 05:25:46 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pg0-x22b.google.com (mail-pg0-x22b.google.com [IPv6:2607:f8b0:400e:c05::22b]) by gabe.freedesktop.org (Postfix) with ESMTPS id 02A526E182 for ; Wed, 10 Jan 2018 05:25:44 +0000 (UTC) Received: by mail-pg0-x22b.google.com with SMTP id i196so10001309pgd.0 for ; Tue, 09 Jan 2018 21:25:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=/fMPiYSDNnLfeFO+DxBuPoA9fPH/u8S5eonnHiq0gbo=; b=QbGxyuHQZQJF1ocBVD3AvlHNI2a3bvxb6TbWjW9ngrmOzAV90qLurPArV/fJuLU5Ok gwla8Z7XBkO617Q/3XyeXJ032kkKPkcZicrD/vq8lK82Q2FKEFmZnFxfalLk1njOmhiD 2+M+ZiGHsm1ZQNn3ylnK0k2OVa+R1Qv8QlJCA= 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=/fMPiYSDNnLfeFO+DxBuPoA9fPH/u8S5eonnHiq0gbo=; b=l4V8yZhwaWnk24qYr0QjNh8KO82iCFZtvroT2dQiYGuL92ORIXIOn0prlcDgZtsrGT GsBKxSqFZgu+oOqhHlUq+mEvuc5RJugYVMPYF8gm/hg3jshN8FoqGePEaKRg0AugS2Y0 9U6Up9sgeqqaG3ZIws74NP95MN5OQK2Njy5SOD/mNTT5GyWqNw4go+Um2H1jyDfeBZQT Ga3G5HW9Y4w9NKJ9+n498ZGiIgobNcLw7f65/KgUpMflvkKpRvDjHp/LaIkUsRSPsr+9 BqdBAZhHxksfQQuRjr5F51Kv9xadKk/KeuZ9E9ClIEW3re72X34exE/iHyg9kjCJrtxs n2ow== X-Gm-Message-State: AKGB3mJqqxyUimbt78VLJesYAvuc/WYKnHgJEbZzaXDpvIlvGu1qB5Q2 j7rQNepHzl6km9zlDKqyZMaXBPp9MQk= X-Google-Smtp-Source: ACJfBotzok8Gsky4ZemSAlakxtWNF9Isd+82K7SbXeWBD0u279hF3QKmrfKXEy8VjJzGA/lewGlmjQ== X-Received: by 10.99.43.86 with SMTP id r83mr14394903pgr.141.1515561943902; Tue, 09 Jan 2018 21:25:43 -0800 (PST) Received: from localhost.localdomain ([2601:1c2:600:5100:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id x22sm33586672pfa.169.2018.01.09.21.25.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 09 Jan 2018 21:25:42 -0800 (PST) From: John Stultz To: dri-devel@lists.freedesktop.org Subject: [PATCH] libdrm: intel/Android.mk: Filter libdrm_intel library requirements on x86 Date: Tue, 9 Jan 2018 21:25:39 -0800 Message-Id: <1515561939-28990-1-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 Cc: Rob Herring , Sean Paul , Emil Velikov , Tomasz Figa , Marissa Wall , Dan Willemsen , Chad Versace X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP When building AOSP after updating libdrm project to the freedesktop/master branch, I've seen the following build errors: external/libdrm/intel/Android.mk: error: libdrm_intel (SHARED_LIBRARIES android-arm64) missing libpciaccess (SHARED_LIBRARIES android-arm64) You can set ALLOW_MISSING_DEPENDENCIES=true in your environment if this is intentional, but that may defer real problems until later in the build. Using ALLOW_MISSING_DEPENDENCIES=true when building allows things to function properly, but is not ideal. So basically, while I'm not including the libdrm_intel package into the build, just the fact that the Android.mk file references libpciaccess which isn't a repo included in AOSP causes the build failure. So it seems we need some sort of conditional filter in the Android.mk to skip over it if we're not building for intel. This is my initial attempt at solving this. Feedback would be greatly appreciated! I note that in the AOSP version of libdrm, the reference to libpciaccess has been removed. See: https://android.googlesource.com/platform/external/libdrm/+/f6a1130dffae8de9ddd0c379066daf1df27fc8af%5E%21/ So I wonder if it make sense to instead remove this upstream as well? While this patch addresses upstream's Andorid.mk, I also notice that the AOSP version of libdrm has converted to Android.bp files: https://android.googlesource.com/platform/external/libdrm/+/fa32e29a1fe81e5472aabc65d3aa25a5af5aec55%5E%21/ and wonder if getting that conversion upstream would be a good idea here? Cc: Emil Velikov Cc: Chad Versace Cc: Marissa Wall Cc: Sean Paul Cc: Rob Herring Cc: Dan Willemsen Cc: Tomasz Figa Signed-off-by: John Stultz --- intel/Android.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/intel/Android.mk b/intel/Android.mk index 5407ff3..d834692 100644 --- a/intel/Android.mk +++ b/intel/Android.mk @@ -21,6 +21,7 @@ # IN THE SOFTWARE. # +ifeq ($(TARGET_ARCH), x86) LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) @@ -37,3 +38,4 @@ LOCAL_SHARED_LIBRARIES := \ include $(LIBDRM_COMMON_MK) include $(BUILD_SHARED_LIBRARY) +endif