flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2026-08-11 16:32:58 +00:00
Code Issues Releases Wiki Activity

intel-gpu-tools: fix version.h creation in android

Browse Source 
commit 743dc7997a
breaks the build under Android because version.h
is not created. This happens because the android
make executes from the ANDROID_BUILD_TOP directory
rather than from the directory containing the source
files, so we need to differentiate between Android
and linux builds. This is V2 of this patch based on
Thomas Wood's suggestion.

Signed-off-by: Tim Gore <tim.gore@intel.com>
[Thomas: Fix distcheck issues]
Signed-off-by: Thomas Wood <thomas.wood@intel.com>
This commit is contained in:
Tim Gore
2014-07-24 17:38:22 +01:00
committed by Thomas Wood
parent 8408e00e62
commit 57bd86068a
3 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Android.mk
+2 -1
View File
@@ -1,6 +1,7 @@
LOCAL_PATH := $(call my-dir)
GPU_TOOLS_PATH := $(LOCAL_PATH)/..
IGT_LIB_PATH := $(LOCAL_PATH)
# FIXME: autogenerate this info #
$(GPU_TOOLS_PATH)/config.h:
@@ -13,7 +14,7 @@ include $(LOCAL_PATH)/Makefile.sources
include $(CLEAR_VARS)
LOCAL_GENERATED_SOURCES := \
$(GPU_TOOLS_PATH)/lib/version.h \
$(IGT_LIB_PATH)/version.h \
$(GPU_TOOLS_PATH)/config.h
LOCAL_C_INCLUDES += \
lib/Makefile.am
+3
View File
@@ -1,3 +1,6 @@
IGT_LIB_PATH := $(builddir)
GPU_TOOLS_PATH := $(top_srcdir)
include Makefile.sources
noinst_LTLIBRARIES = libintel_tools.la
lib/Makefile.sources
+13 -11
View File
@@ -48,12 +48,14 @@ libintel_tools_la_SOURCES = \
$(NULL)
.PHONY: version.h.tmp
version.h.tmp:
$(IGT_LIB_PATH)/version.h.tmp:
@touch $@
@if test -d $(top_srcdir)/.git; then \
if which git > /dev/null 2>&1; then git log -n 1 --oneline | \
@if test -d $(GPU_TOOLS_PATH)/.git; then \
if which git > /dev/null 2>&1; then cd $(@D); \
git log -n 1 --oneline | \
sed 's/^\([^ ]*\) .*/#define IGT_GIT_SHA1 "g\1"/' \
>> $@ ; \
>> $(@F) ; \
else \
echo '#define IGT_GIT_SHA1 "NO-GIT"' >> $@ ; \
fi \
@@ -61,14 +63,14 @@ version.h.tmp:
echo '#define IGT_GIT_SHA1 "NOT-GIT"' >> $@ ; \
fi
version.h: version.h.tmp
@if ! cmp -s version.h.tmp version.h; then \
echo "updating version.h"; \
mv version.h.tmp version.h ;\
$(IGT_LIB_PATH)/version.h: $(IGT_LIB_PATH)/version.h.tmp
@if ! cmp -s $(IGT_LIB_PATH)/version.h.tmp $(IGT_LIB_PATH)/version.h; then \
mv $(IGT_LIB_PATH)/version.h.tmp $(IGT_LIB_PATH)/version.h ; \
else \
rm version.h.tmp ;\
rm $(IGT_LIB_PATH)/version.h.tmp ; \
fi
BUILT_SOURCES = version.h
CLEANFILES = version.h version.h.tmp
BUILT_SOURCES = $(IGT_LIB_PATH)/version.h
CLEANFILES = $(IGT_LIB_PATH)/version.h $(IGT_LIB_PATH)/version.h.tmp