Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pkg/relic: fix for macOS #6105

Merged
merged 1 commit into from
Nov 14, 2016
Merged

pkg/relic: fix for macOS #6105

merged 1 commit into from
Nov 14, 2016

Conversation

smlng
Copy link
Member

@smlng smlng commented Nov 10, 2016

This PR fixes some incompatible shell scripts, i.e. calling sed, on macOS and compiler error when compiling for target native.

@smlng smlng changed the title pkg/relic: fix for mac os pkg/relic: fix for macOS Nov 10, 2016
@smlng smlng added OS: Mac OS X Host OS: This PR/issue concerns usage of RIOT with Mac OS X as a host system Area: pkg Area: External package ports labels Nov 10, 2016
LudwigKnuepfer
LudwigKnuepfer reviewed Nov 11, 2016
View reviewed changes
pkg/relic/fix-old-style-definitions.sh
SEDCMD="sed -i ''"
LANG=C
fi
find ${1} -name "*.[ch]" -exec $SEDCMD 's/() {/(void) {/' {} +
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

$SEDCMD => ${SEDCMD} here and elsewhere

@smlng
Copy link
Member Author

smlng commented Nov 11, 2016

@LudwigKnuepfer adapted.

@smlng smlng added the CI: needs squashing Commits in this PR need to be squashed; If set, CI systems will mark this PR as unmergable label Nov 11, 2016
@smlng smlng added CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR and removed CI: needs squashing Commits in this PR need to be squashed; If set, CI systems will mark this PR as unmergable labels Nov 11, 2016
@smlng
Copy link
Member Author

smlng commented Nov 11, 2016

@cgundogan, @tfar, can you have look at this one? I'd like to get this merged soonish, 'cause it fixes unittests on macOS/OSX - on current master they do not build.

Even Murdock is happy ...

@cgundogan
Copy link
Member

No objections from my side, but could you remove the code duplication by e.g. creating a common sh script file that is sourced by both and defines the SEDCMD accordingly?

@smlng
Copy link
Member Author

smlng commented Nov 13, 2016

@cgundogan good idea, adapted.

@cgundogan
Copy link
Member

murdock says:

./fix-util_print_wo_args.sh: 2: ./fix-util_print_wo_args.sh: source: not found
find: `s/util_print("\\(.*\\)")/util_print("\\1", NULL)/g': No such file or directory

@cgundogan
Copy link
Member

you should probably use source ./os_util.sh instead of source os_util.sh

@cgundogan cgundogan added CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR and removed CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR labels Nov 14, 2016
@smlng
Copy link
Member Author

smlng commented Nov 14, 2016

The problem is that the script is called with /bin/sh, which has no source command. Anyway, fixed now, works on macOS and Linux; let's see what murdock has to say ...

cgundogan
cgundogan approved these changes Nov 14, 2016
View reviewed changes
Copy link
Member

@cgundogan cgundogan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Murdock is happy now. ACK and GO

@cgundogan cgundogan merged commit 603855a into RIOT-OS:master Nov 14, 2016
@miri64 miri64 added the Process: needs backport Integration Process: The PR is required to be backported to a release or feature branch label Nov 14, 2016
@miri64
Copy link
Member

miri64 commented Nov 14, 2016

Please provide a backport for 2016.10.

@smlng smlng mentioned this pull request Nov 14, 2016
Merged
@miri64 miri64 removed the Process: needs backport Integration Process: The PR is required to be backported to a release or feature branch label Nov 17, 2016
@smlng smlng deleted the pr/pkg/relic/fix_for_macOS branch January 27, 2017 19:31
This was referenced Oct 20, 2017
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LudwigKnuepfer LudwigKnuepfer LudwigKnuepfer left review comments

@cgundogan cgundogan cgundogan approved these changes

Assignees

@kYc0o kYc0o

Labels
Area: pkg Area: External package ports CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR OS: Mac OS X Host OS: This PR/issue concerns usage of RIOT with Mac OS X as a host system
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@smlng @cgundogan @miri64 @LudwigKnuepfer @kYc0o