Message ID | 20170704140404.4098-11-arnout@mind.be |
---|---|
State | Accepted |
Headers | show |
Hi Arnout, Le 04/07/2017 à 16:04, Arnout Vandecappelle (Essensium/Mind) a écrit : > Remove the redundant usr/ component of the HOST_DIR paths. Since a > previous commit added a symlink from $(HOST_DIR)/usr to $(HOST_DIR), > everything keeps on working. > > Build-tested with a bunch of cmake packages. > > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Reviewed-by: Romain Naour <romain.naour@smile.fr> Best regards, Romain > --- > package/pkg-cmake.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk > index 0897430f70..0606d26ad7 100644 > --- a/package/pkg-cmake.mk > +++ b/package/pkg-cmake.mk > @@ -115,7 +115,7 @@ define $(2)_CONFIGURE_CMDS > -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="BOTH" \ > -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY="BOTH" \ > -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE="BOTH" \ > - -DCMAKE_INSTALL_PREFIX="$$(HOST_DIR)/usr" \ > + -DCMAKE_INSTALL_PREFIX="$$(HOST_DIR)" \ > -DCMAKE_C_FLAGS="$$(HOST_CFLAGS)" \ > -DCMAKE_CXX_FLAGS="$$(HOST_CXXFLAGS)" \ > -DCMAKE_EXE_LINKER_FLAGS="$$(HOST_LDFLAGS)" \ >
diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 0897430f70..0606d26ad7 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -115,7 +115,7 @@ define $(2)_CONFIGURE_CMDS -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="BOTH" \ -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY="BOTH" \ -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE="BOTH" \ - -DCMAKE_INSTALL_PREFIX="$$(HOST_DIR)/usr" \ + -DCMAKE_INSTALL_PREFIX="$$(HOST_DIR)" \ -DCMAKE_C_FLAGS="$$(HOST_CFLAGS)" \ -DCMAKE_CXX_FLAGS="$$(HOST_CXXFLAGS)" \ -DCMAKE_EXE_LINKER_FLAGS="$$(HOST_LDFLAGS)" \
Remove the redundant usr/ component of the HOST_DIR paths. Since a previous commit added a symlink from $(HOST_DIR)/usr to $(HOST_DIR), everything keeps on working. Build-tested with a bunch of cmake packages. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> --- package/pkg-cmake.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)