Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
openwrt-packages
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Feed
openwrt-packages
Commits
70a990ac
Unverified
Commit
70a990ac
authored
5 years ago
by
Rosen Penev
Committed by
GitHub
5 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #10520 from Kulipator/libmraa_ramips_fix
[18.06] Libmraa compilation fix
parents
b83b26c3
cf4e50ab
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
libs/libmraa/Makefile
+2
-2
2 additions, 2 deletions
libs/libmraa/Makefile
libs/libmraa/patches/0001-base.patch
+3
-3
3 additions, 3 deletions
libs/libmraa/patches/0001-base.patch
libs/libmraa/patches/0004-fixes.patch
+1
-1
1 addition, 1 deletion
libs/libmraa/patches/0004-fixes.patch
with
6 additions
and
6 deletions
libs/libmraa/Makefile
+
2
−
2
View file @
70a990ac
...
...
@@ -8,14 +8,14 @@
include
$(TOPDIR)/rules.mk
PKG_NAME
:=
libmraa
PKG_VERSION
:=
0.8.
0
PKG_VERSION
:=
0.8.
1
PKG_RELEASE
=
$(
PKG_SOURCE_VERSION
)
PKG_SOURCE_PROTO
:=
git
PKG_SOURCE_URL
:=
https://github.com/intel-iot-devkit/mraa.git
PKG_SOURCE_SUBDIR
:=
$(
PKG_NAME
)
-
$(
PKG_VERSION
)
PKG_SOURCE_VERSION
:=
70600dece4138b0c0dbaff42f57828f1559cd840
PKG_SOURCE_VERSION
:=
049ba5fa9f2d18ac0ec6729c46916b34998d3c5f
PKG_SOURCE
:=
$(
PKG_NAME
)
-
$(
PKG_VERSION
)
-
$(
PKG_SOURCE_VERSION
)
.tar.gz
PKG_MIRROR_HASH
:=
9cbda58e7c7790db3d62cee62f399975effcdc2d9688d3d6bb2b4a86748faff9
PKG_BUILD_DEPENDS
:=
node python/host swig/host node/host
...
...
This diff is collapsed.
Click to expand it.
libs/libmraa/patches/0001-base.patch
+
3
−
3
View file @
70a990ac
...
...
@@ -21,11 +21,11 @@ Subject: [PATCH 1/4] base
# Make a version file containing the current version from git.
-include (GetGitRevisionDescription)
-git_describe (VERSION "--tags")
-if ("x_${VERSION}" STREQUAL "x_GIT-NOTFOUND" OR "x_${VERSION}" STREQUAL "x_HEAD-HASH-NOTFOUND")
-if ("x_${VERSION}" STREQUAL "x_GIT-NOTFOUND" OR "x_${VERSION}" STREQUAL "x_HEAD-HASH-NOTFOUND"
OR "x_${VERSION}" STREQUAL "x_-128-NOTFOUND"
)
- message (WARNING " - Install git to compile a production libmraa!")
- set (VERSION "v0.8.
0
-dirty")
- set (VERSION "v0.8.
1
-dirty")
-endif ()
+set (VERSION "v0.8.
0
")
+set (VERSION "v0.8.
1
")
message (INFO " - libmraa Version ${VERSION}")
...
...
This diff is collapsed.
Click to expand it.
libs/libmraa/patches/0004-fixes.patch
+
1
−
1
View file @
70a990ac
...
...
@@ -655,7 +655,7 @@ Subject: [PATCH 4/4] fixes
b->gpio_count++;
--- a/src/gpio/gpio.c
+++ b/src/gpio/gpio.c
@@ -11
3
,6 +11
3
,8 @@
@@ -11
4
,6 +11
4
,8 @@
close(export);
}
...
...
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