diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-06-06 12:36:56 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-06-09 17:05:55 +0200 |
| commit | 0584e7233ebf663bbcdc3fe929c0172d895b94ea (patch) | |
| tree | f67d3d3c324c7fa4bc327d466ef8ea25f0fa1930 | |
| parent | ba1a503feeda6704a1337b9ccc6c0f2288a574de (diff) | |
gbuild: UnpackedTarball: use Win32 paths for make targets
Change-Id: I78f56bb28d4b9b6c0696f83f3e06d836fd3427cd
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | solenv/gbuild/UnpackedTarball.mk | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 9cc15839c5b9..3ef3ce26fb9f 100644 --- a/configure.ac +++ b/configure.ac @@ -4816,7 +4816,8 @@ if test -z "$TARFILE_LOCATION"; then TARFILE_LOCATION="$SRC_ROOT/external/tarballs" else AbsolutePath "$TARFILE_LOCATION" - TARFILE_LOCATION="${absolute_path}" + PathFormat "${absolute_path}" + TARFILE_LOCATION="${formatted_path}" fi AC_SUBST(TARFILE_LOCATION) diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk index 6021acb508c3..c7d707c35664 100644 --- a/solenv/gbuild/UnpackedTarball.mk +++ b/solenv/gbuild/UnpackedTarball.mk @@ -13,6 +13,7 @@ # platform # gb_UnpackedTarget_TARFILE_LOCATION +# NOTE: only for commands; targets should use TARFILE_LOCATION directly gb_UnpackedTarget_STRIP_COMPONENTS_TAR_DEFAULT := 1 gb_UnpackedTarget_STRIP_COMPONENTS_ZIP_DEFAULT := 0 @@ -89,7 +90,7 @@ $(call gb_UnpackedTarget_get_target,$(1)) : UNPACKED_DIR := $(2) $(call gb_UnpackedTarget_get_target,$(1)) : UNPACKED_TARBALL := $(gb_UnpackedTarget_TARFILE_LOCATION)/$(1) $(call gb_UnpackedTarget_get_target,$(1)) : UNPACKED_STRIP_COMPONENTS := $(call gb_UnpackedTarget__get_strip_components,$(1),$(3)) -$(call gb_UnpackedTarget_get_target,$(1)) : $(gb_UnpackedTarget_TARFILE_LOCATION)/$(1) +$(call gb_UnpackedTarget_get_target,$(1)) : $(TARFILE_LOCATION)/$(1) $(call gb_UnpackedTarget_get_target,$(1)) :| $(dir $(call gb_UnpackedTarget_get_target,$(1))).dir endef @@ -242,8 +243,8 @@ $(call gb_UnpackedTarget_get_target,$(2)) : $(call gb_UnpackedTarball_get_prepar $(if $(findstring in,$(5)), $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_IS_BIN_TARBALL := YES $(call gb_ExternalProject_get_state_target,$(1),%) : UNPACKED_IS_BIN_TARBALL := YES) -$(if $(findstring out,$(5)),$(call gb_Module_get_target,$(4)) : $(gb_UnpackedTarget_TARFILE_LOCATION)/$(6) -$(gb_UnpackedTarget_TARFILE_LOCATION)/$(6) : $(call gb_Module_get_nonl10n_target,$(4)) +$(if $(findstring out,$(5)),$(call gb_Module_get_target,$(4)) : $(TARFILE_LOCATION)/$(6) +$(TARFILE_LOCATION)/$(6) : $(call gb_Module_get_nonl10n_target,$(4)) $$(call gb_Output_announce,$(6),$(true),PKB,3) if test ! -f "$$@" ; then cd $(call gb_UnpackedTarball_get_dir,) && $(GNUTAR) -czf "$$@" $(1)/ || $(GNUTAR) -czf "$$@" $(1)/ ; else touch "$$@" ; fi) |