nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: cmake: fix backport to use correct prefix for host packages

Browse Source
This commit is contained in:
Matthias Schiffer 2017-05-10 10:34:23 +02:00
parent 14c2aff7c0
commit 4014e43911
No known key found for this signature in database
GPG Key ID: 16EF3F64CB201D9C
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
patches/openwrt/0100-cmake-backport-from-LEDE-17.01-d1e0cc8cd5b460df47a2316653c273e27ebf93b1.patch
View File

@ -3,7 +3,7 @@ Date: Tue, 9 May 2017 18:37:17 +0200
Subject: cmake: backport from LEDE 17.01 d1e0cc8cd5b460df47a2316653c273e27ebf93b1 Subject: cmake: backport from LEDE 17.01 d1e0cc8cd5b460df47a2316653c273e27ebf93b1
diff --git a/include/cmake.mk b/include/cmake.mk diff --git a/include/cmake.mk b/include/cmake.mk
index 4207a4dcee8444ac1472b2b78a068e5ed811c7ae..5a403cbf41e2bbd6bdb843492639a01aff8cf75b 100644 index 4207a4dcee8444ac1472b2b78a068e5ed811c7ae..68dccc969f54e0d84e04404711dc2724120a23d3 100644
--- a/include/cmake.mk --- a/include/cmake.mk
+++ b/include/cmake.mk +++ b/include/cmake.mk
@@ -1,10 +1,15 @@ @@ -1,10 +1,15 @@
@ -55,14 +55,8 @@ index 4207a4dcee8444ac1472b2b78a068e5ed811c7ae..5a403cbf41e2bbd6bdb843492639a01a
LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \
cmake \ cmake \
-DCMAKE_SYSTEM_NAME=Linux \ -DCMAKE_SYSTEM_NAME=Linux \
@@ -97,10 +100,14 @@ define Host/Configure/Default @@ -101,6 +104,10 @@ define Host/Configure/Default
-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \ -DCMAKE_PREFIX_PATH=$(STAGING_DIR_HOST) \
-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \
-DCMAKE_STRIP=: \
- -DCMAKE_INSTALL_PREFIX=$(STAGING_DIR_HOST) \
- -DCMAKE_PREFIX_PATH=$(STAGING_DIR_HOST) \
+ -DCMAKE_INSTALL_PREFIX=$(HOST_BUILD_PREFIX) \
+ -DCMAKE_PREFIX_PATH=$(HOST_BUILD_PREFIX) \
-DCMAKE_SKIP_RPATH=TRUE \ -DCMAKE_SKIP_RPATH=TRUE \
$(CMAKE_HOST_OPTIONS) \ $(CMAKE_HOST_OPTIONS) \
- $(CMAKE_SOURCE_DIR) \ - $(CMAKE_SOURCE_DIR) \