jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 22:26:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/qemu: unset TARGET_DIR

Browse Source 
qemu uses TARGET_DIR internally, and it is at least used to display the
shortened compiling commands, like (with a TARGET_DIR=/path/to/target):

    CC /path/to/targetblock/write-threshold.o

VS

    CC block/write-threshold.o

There does not seem to be any adverse effect to that, but this is very
confusing to see, especially when building the host variant.

Fix that by unsetting TARGET_DIR prior to building.

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Yann E. MORIN 2019-04-28 19:43:59 +02:00 committed by Peter Korsgaard
parent 80a5217476
commit 138014bf23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
package/qemu/qemu.mk
View File

@ -95,7 +95,8 @@ endif
# Override CPP, as it expects to be able to call it like it'd # Override CPP, as it expects to be able to call it like it'd
# call the compiler. # call the compiler.
define QEMU_CONFIGURE_CMDS define QEMU_CONFIGURE_CMDS
( cd $(@D); \ unset TARGET_DIR; \
cd $(@D); \
LIBS='$(QEMU_LIBS)' \ LIBS='$(QEMU_LIBS)' \
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \ $(TARGET_CONFIGURE_ARGS) \
@ -137,15 +138,16 @@ define QEMU_CONFIGURE_CMDS
--disable-capstone \ --disable-capstone \
--disable-git-update \ --disable-git-update \
--disable-opengl \ --disable-opengl \
$(QEMU_OPTS) \ $(QEMU_OPTS)
)
endef endef
define QEMU_BUILD_CMDS define QEMU_BUILD_CMDS
unset TARGET_DIR; \
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
endef endef
define QEMU_INSTALL_TARGET_CMDS define QEMU_INSTALL_TARGET_CMDS
unset TARGET_DIR; \
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(QEMU_MAKE_ENV) DESTDIR=$(TARGET_DIR) install $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(QEMU_MAKE_ENV) DESTDIR=$(TARGET_DIR) install
endef endef
@ -264,6 +266,7 @@ endif
# Override CPP, as it expects to be able to call it like it'd # Override CPP, as it expects to be able to call it like it'd
# call the compiler. # call the compiler.
define HOST_QEMU_CONFIGURE_CMDS define HOST_QEMU_CONFIGURE_CMDS
unset TARGET_DIR; \
cd $(@D); $(HOST_CONFIGURE_OPTS) CPP="$(HOSTCC) -E" \ cd $(@D); $(HOST_CONFIGURE_OPTS) CPP="$(HOSTCC) -E" \
./configure \ ./configure \
--target-list="$(HOST_QEMU_TARGETS)" \ --target-list="$(HOST_QEMU_TARGETS)" \
@ -277,10 +280,12 @@ define HOST_QEMU_CONFIGURE_CMDS
endef endef
define HOST_QEMU_BUILD_CMDS define HOST_QEMU_BUILD_CMDS
unset TARGET_DIR; \
$(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_MAKE_ENV) $(MAKE) -C $(@D)
endef endef
define HOST_QEMU_INSTALL_CMDS define HOST_QEMU_INSTALL_CMDS
unset TARGET_DIR; \
$(HOST_MAKE_ENV) $(MAKE) -C $(@D) install $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install
endef endef