Patchwork [4/8] package/pkg-cmake.mk: make sure $(HOST_PATH) is in the PATH at configure time

login
register
mail settings
Submitter Samuel Martin
Date Dec. 30, 2012, 10:54 p.m.
Message ID <c99cf48af8dd733748078dd4b6fa47ada5a106e5.1356907750.git.s.martin49@gmail.com>
Download mbox | patch
Permalink /patch/208802/
State Deferred
Headers show

Comments

Samuel Martin - Dec. 30, 2012, 10:54 p.m.
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 package/pkg-cmake.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
Arnout Vandecappelle - Feb. 7, 2013, 7:08 a.m.
On 30/12/12 23:54, Samuel Martin wrote:
>
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>

Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>


  Regards,
  Arnout

> ---
>   package/pkg-cmake.mk | 5 +++--
>   1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk
> index 626a0b0..1e8302f 100644
> --- a/package/pkg-cmake.mk
> +++ b/package/pkg-cmake.mk
> @@ -62,7 +62,8 @@ ifeq ($(5),target)
>   define $(2)_CONFIGURE_CMDS
>   	(cd $$($$(PKG)_BUILDDIR) && \
>   	rm -f CMakeCache.txt && \
> -	$$($$(PKG)_CONF_ENV) $(HOST_DIR)/usr/bin/cmake $$($$(PKG)_SRCDIR) \
> +	PATH="$(TARGET_PATH)" $$($$(PKG)_CONF_ENV) \
> +		$(HOST_DIR)/usr/bin/cmake $$($$(PKG)_SRCDIR) \
>   		-DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake" \
>   		-DCMAKE_INSTALL_PREFIX="/usr" \
>   		$$($$(PKG)_CONF_OPT) \
> @@ -74,7 +75,7 @@ else
>   define $(2)_CONFIGURE_CMDS
>   	(cd $$($$(PKG)_BUILDDIR) && \
>   	rm -f CMakeCache.txt && \
> -	$(HOST_DIR)/usr/bin/cmake $$($$(PKG)_SRCDIR) \
> +	PATH="$(HOST_PATH)" $(HOST_DIR)/usr/bin/cmake $$($$(PKG)_SRCDIR) \
>   		-DCMAKE_INSTALL_SO_NO_EXE=0 \
>   		-DCMAKE_FIND_ROOT_PATH="$$(HOST_DIR)" \
>   		-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="BOTH" \
>

Patch

diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk
index 626a0b0..1e8302f 100644
--- a/package/pkg-cmake.mk
+++ b/package/pkg-cmake.mk
@@ -62,7 +62,8 @@  ifeq ($(5),target)
 define $(2)_CONFIGURE_CMDS
 	(cd $$($$(PKG)_BUILDDIR) && \
 	rm -f CMakeCache.txt && \
-	$$($$(PKG)_CONF_ENV) $(HOST_DIR)/usr/bin/cmake $$($$(PKG)_SRCDIR) \
+	PATH="$(TARGET_PATH)" $$($$(PKG)_CONF_ENV) \
+		$(HOST_DIR)/usr/bin/cmake $$($$(PKG)_SRCDIR) \
 		-DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake" \
 		-DCMAKE_INSTALL_PREFIX="/usr" \
 		$$($$(PKG)_CONF_OPT) \
@@ -74,7 +75,7 @@  else
 define $(2)_CONFIGURE_CMDS
 	(cd $$($$(PKG)_BUILDDIR) && \
 	rm -f CMakeCache.txt && \
-	$(HOST_DIR)/usr/bin/cmake $$($$(PKG)_SRCDIR) \
+	PATH="$(HOST_PATH)" $(HOST_DIR)/usr/bin/cmake $$($$(PKG)_SRCDIR) \
 		-DCMAKE_INSTALL_SO_NO_EXE=0 \
 		-DCMAKE_FIND_ROOT_PATH="$$(HOST_DIR)" \
 		-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="BOTH" \