From: John Stultz <john.stultz@linaro.org>
To: dri-devel <dri-devel@lists.freedesktop.org>
Cc: Rob Herring <rob.herring@linaro.org>,
Sean Paul <seanpaul@google.com>,
Robert Foss <robert.foss@collabora.com>,
Emil Velikov <emil.l.velikov@gmail.com>,
Tomasz Figa <tfiga@google.com>,
Marissa Wall <marissaw@google.com>,
Dan Willemsen <dwillemsen@google.com>
Subject: [RFC][PATCH] libdrm: intel/Android.mk: Limit x86/x86_64 filtering to just libpciaccess
Date: Mon, 19 Mar 2018 19:04:48 -0700 [thread overview]
Message-ID: <1521511488-8938-1-git-send-email-john.stultz@linaro.org> (raw)
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 <rob.herring@linaro.org>
Cc: Sean Paul <seanpaul@google.com>
Cc: Robert Foss <robert.foss@collabora.com>
Cc: Emil Velikov <emil.l.velikov@gmail.com>
Cc: Tomasz Figa <tfiga@google.com>
Cc: Marissa Wall <marissaw@google.com>
Cc: Dan Willemsen <dwillemsen@google.com>
Fixes: ed07718ae7ba ("libdrm: intel/Android.mk: Filter
libdrm_intel library requirements on x86/x86_64")
Reported-by: Stefan Schake <stschake@gmail.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
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
--
2.7.4
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
reply other threads:[~2018-03-20 2:04 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1521511488-8938-1-git-send-email-john.stultz@linaro.org \
--to=john.stultz@linaro.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=dwillemsen@google.com \
--cc=emil.l.velikov@gmail.com \
--cc=marissaw@google.com \
--cc=rob.herring@linaro.org \
--cc=robert.foss@collabora.com \
--cc=seanpaul@google.com \
--cc=tfiga@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox