Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFS Gluon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
0x4A6F
FFS Gluon
Commits
4014e439
Unverified
Commit
4014e439
authored
8 years ago
by
Matthias Schiffer
Browse files
Options
Downloads
Patches
Plain Diff
build: cmake: fix backport to use correct prefix for host packages
parent
14c2aff7
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
patches/openwrt/0100-cmake-backport-from-LEDE-17.01-d1e0cc8cd5b460df47a2316653c273e27ebf93b1.patch
+3
-9
3 additions, 9 deletions
...LEDE-17.01-d1e0cc8cd5b460df47a2316653c273e27ebf93b1.patch
with
3 additions
and
9 deletions
patches/openwrt/0100-cmake-backport-from-LEDE-17.01-d1e0cc8cd5b460df47a2316653c273e27ebf93b1.patch
+
3
−
9
View file @
4014e439
...
...
@@ -3,7 +3,7 @@ Date: Tue, 9 May 2017 18:37:17 +0200
Subject: cmake: backport from LEDE 17.01 d1e0cc8cd5b460df47a2316653c273e27ebf93b1
diff --git a/include/cmake.mk b/include/cmake.mk
index 4207a4dcee8444ac1472b2b78a068e5ed811c7ae..
5a403cbf41e2bbd6bdb843492639a01aff8cf75b
100644
index 4207a4dcee8444ac1472b2b78a068e5ed811c7ae..
68dccc969f54e0d84e04404711dc2724120a23d3
100644
--- a/include/cmake.mk
+++ b/include/cmake.mk
@@ -1,10 +1,15 @@
...
...
@@ -55,14 +55,8 @@ index 4207a4dcee8444ac1472b2b78a068e5ed811c7ae..5a403cbf41e2bbd6bdb843492639a01a
LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \
cmake \
-DCMAKE_SYSTEM_NAME=Linux \
@@ -97,10 +100,14 @@
define Host/Configure/Default
-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \
-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) \
@@ -101,6 +104,10 @@
define Host/Configure/Default
-DCMAKE_PREFIX_PATH=$(STAGING_DIR_HOST) \
-DCMAKE_SKIP_RPATH=TRUE \
$(CMAKE_HOST_OPTIONS) \
- $(CMAKE_SOURCE_DIR) \
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment