From patchwork Wed Mar 14 16:47:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 10282775 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 EF815602C2 for ; Wed, 14 Mar 2018 16:47:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E0B5425D99 for ; Wed, 14 Mar 2018 16:47:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D552F27C2D; Wed, 14 Mar 2018 16:47:45 +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 C8E2625D99 for ; Wed, 14 Mar 2018 16:47:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 974BA6E68E; Wed, 14 Mar 2018 16:47:42 +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 C1DFB6E68E for ; Wed, 14 Mar 2018 16:47:41 +0000 (UTC) Received: by mail-pl0-x242.google.com with SMTP id c11-v6so2023872plo.0 for ; Wed, 14 Mar 2018 09:47:41 -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=9FjKlq0dExh80RQx/jWNqervPd1sVkaR9IqWA6/r25s=; b=ajdL+c7uXXVfAFWhLA7l4ZLKDtH4Il77pPl3GICTDGQrO+fXAY6RHt3HrOnL4RH4eY w/ydn2cZ1WrG1Y5Rlyw48fk6S3Sr+koPUeEiQO5ITf98d/e8mC12DebDnEbpq7GxEC1k dWMqdW8Ccfqk0QcTRZOj6+2ZkbGC0yF1AnKtU= 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=9FjKlq0dExh80RQx/jWNqervPd1sVkaR9IqWA6/r25s=; b=NGnNNYxqdJtM0aO/BGWx+htZCbEeGmwTky+/PkXIY6xgXHBqdlO+ehmke4CJeGY7z0 L6ByiHIF3nW55XKLcIURPIa+bER58IZEB058H7onkZ8RxBbvoZiJNB6rN5DvmWLm4rma 1YBBHpQaQLjC8qOUvgYAF8fmpth6wpMuglMx49Kmz7J9JfJcHf3VpK8fy9YQctQ+WHYM vufxIU9aMBlDtshi2L7x5JIHoRQ8L6JVZUzIiu76oYuA/JJ18nqyjDJM3PzNRHDqHGgr B2NJoNkKQK8MYQFz93+on/jGbNvYsvhGGD1vZV0kP/a2E5A3ZNrTiR1+Bip99qP4Ol/I JAZQ== X-Gm-Message-State: AElRT7Go092K7Z629l0QhEGv1RcnWpAAKWEItPmRvQo8CBx2yL3QBI0e G18+ncgwTPNWcQvgbyfPLZVeDHMKuz4= X-Google-Smtp-Source: AG47ELtpJmMfYzsSoo9Z8WsyWIfPeLsZWxVURBuqIEZjTpnTfhyfAdu/e23bQcCOetfHppLlI8bS+w== X-Received: by 2002:a17:902:8485:: with SMTP id c5-v6mr2697384plo.230.1521046060634; Wed, 14 Mar 2018 09:47:40 -0700 (PDT) Received: from localhost.localdomain ([2601:1c2:600:5100:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id k3sm5650016pgn.27.2018.03.14.09.47.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 14 Mar 2018 09:47:39 -0700 (PDT) From: John Stultz To: dri-devel Subject: [PATCH] libdrm: intel/Android.mk: Filter libdrm_intel library requirements on x86/x86_64 Date: Wed, 14 Mar 2018 09:47:36 -0700 Message-Id: <1521046056-10946-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 , Chad Versace 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. Change-Id: I6cb51c7bb0a7d1a0ab1723b7d3f20aea38988495 Cc: Emil Velikov Cc: Chad Versace Cc: Marissa Wall Cc: Sean Paul Cc: Rob Herring Cc: Dan Willemsen Cc: Tomasz Figa Cc: Robert Foss Signed-off-by: John Stultz Reviewed-by: Emil Velikov --- v2: Check for x86_64 as well --- intel/Android.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/intel/Android.mk b/intel/Android.mk index 5407ff3..3f9db78 100644 --- a/intel/Android.mk +++ b/intel/Android.mk @@ -21,6 +21,7 @@ # IN THE SOFTWARE. # +ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64)) LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) @@ -37,3 +38,4 @@ LOCAL_SHARED_LIBRARIES := \ include $(LIBDRM_COMMON_MK) include $(BUILD_SHARED_LIBRARY) +endif