Skip to content

Commit

Permalink
Merge pull request #6119 from smlng/bp/pkg/relic/fix_for_macOS
Browse files Browse the repository at this point in the history
[backport] pkg/relic: fix for macOS
  • Loading branch information
miri64 authored Nov 15, 2016
2 parents 6e1fe5f + deabca2 commit 926d28f
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 2 deletions.
2 changes: 2 additions & 0 deletions pkg/relic/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ $(PKG_BUILDDIR)/comp-options.cmake: fix_source
$(PKG_BUILDDIR)/Makefile: $(PKG_BUILDDIR)/comp-options.cmake
cd "$(PKG_BUILDDIR)" && COMP="$(filter-out -Werror=old-style-definition -Werror=strict-prototypes, $(CFLAGS) ) " cmake -DCMAKE_TOOLCHAIN_FILE=comp-options.cmake -DCHECK=off -DTESTS=0 -DBENCH=0 -DSHLIB=off -Wno-dev $(RELIC_CONFIG_FLAGS) .

CFLAGS += -Wno-gnu-zero-variadic-macro-arguments -Wno-unused-function

fix_source: git-download
./fix-util_print_wo_args.sh $(PKG_BUILDDIR)
./fix-old-style-definitions.sh $(PKG_BUILDDIR)
Expand Down
3 changes: 2 additions & 1 deletion pkg/relic/fix-old-style-definitions.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
#!/bin/sh
find ${1} -name "*.[ch]" | xargs sed -i 's/() {/(void) {/'
. ${RIOTBASE}/pkg/relic/os_util.sh
find ${1} -type f -name "*.[ch]" -exec ${SEDBIN} 's/() {/(void) {/' {} +
3 changes: 2 additions & 1 deletion pkg/relic/fix-util_print_wo_args.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
#!/bin/sh
find ${1} -name "*.[ch]" | xargs sed -i 's/util_print("\(.*\)")/util_print("\1", NULL)/g'
. ${RIOTBASE}/pkg/relic/os_util.sh
find ${1} -type f -name "*.[ch]" -exec ${SEDBIN} 's/util_print("\(.*\)")/util_print("\1", NULL)/g' {} +
6 changes: 6 additions & 0 deletions pkg/relic/os_util.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
OSNAME=`uname -s`
SEDBIN="sed -i"
if [ "${OSNAME}" = "Darwin" ] ; then
SEDBIN="sed -i ''"
LANG=C
fi

0 comments on commit 926d28f

Please sign in to comment.