diff --git a/pkg/relic/Makefile b/pkg/relic/Makefile index 0e7deaf10d66c8014d7c94d586bd0f12b2787145..cdb9e0bfda35eaecdf9499047bdd1ddbde891221 100644 --- a/pkg/relic/Makefile +++ b/pkg/relic/Makefile @@ -1,6 +1,6 @@ PKG_NAME=relic PKG_URL=https://github.com/relic-toolkit/relic.git -PKG_VERSION=cdcfaeef101d18c3231c3b46359c519dd72682e8 +PKG_VERSION=0b0442a8218df8d309266923f2dd5b9ae3b318ce PKG_LICENSE=LGPL-2.1 .PHONY: all @@ -15,16 +15,12 @@ all: $(PKG_BUILDDIR)/Makefile $(PKG_BUILDDIR)/Makefile: $(TOOLCHAIN_FILE) cd $(PKG_BUILDDIR) && \ - COMP="$(filter-out -Werror=old-style-definition -Werror=strict-prototypes, $(CFLAGS) ) " \ + COMP="$(filter-out -Werror -Werror=old-style-definition -Werror=strict-prototypes -std=gnu99, $(CFLAGS) ) " \ cmake -DCMAKE_TOOLCHAIN_FILE=$(TOOLCHAIN_FILE) \ -DCHECK=off -DTESTS=0 -DBENCH=0 -DSHLIB=off -Wno-dev $(RELIC_CONFIG_FLAGS) . -$(TOOLCHAIN_FILE): fix_source - $(RIOTTOOLS)/cmake/generate-xcompile-toolchain.sh > $(TOOLCHAIN_FILE) - -fix_source: git-download - ./fix-util_print_wo_args.sh $(PKG_BUILDDIR) - ./fix-old-style-definitions.sh $(PKG_BUILDDIR) +$(TOOLCHAIN_FILE): git-download + $(RIOTBASE)/dist/tools/cmake/generate-xcompile-toolchain.sh > $(TOOLCHAIN_FILE) clean:: @rm -rf $(BINDIR)/$(PKG_NAME).a diff --git a/pkg/relic/fix-old-style-definitions.sh b/pkg/relic/fix-old-style-definitions.sh deleted file mode 100755 index 752422b96ce0cadd7e64973df06b857363ab6a2e..0000000000000000000000000000000000000000 --- a/pkg/relic/fix-old-style-definitions.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -. ${RIOTBASE}/pkg/relic/os_util.sh -find ${1} -type f -name "*.[ch]" -exec ${SEDBIN} 's/() {/(void) {/' {} + diff --git a/pkg/relic/fix-util_print_wo_args.sh b/pkg/relic/fix-util_print_wo_args.sh deleted file mode 100755 index a2355f3be69ca7b2e039782d26dbedf81ed07d3c..0000000000000000000000000000000000000000 --- a/pkg/relic/fix-util_print_wo_args.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -. ${RIOTBASE}/pkg/relic/os_util.sh -find ${1} -type f -name "*.[ch]" -exec ${SEDBIN} 's/util_print("\(.*\)")/util_print("\1", NULL)/g' {} + diff --git a/pkg/relic/patches/0001-fixed-signedness-of-counter-variable.patch b/pkg/relic/patches/0001-fixed-signedness-of-counter-variable.patch deleted file mode 100644 index c4dbd2917536703295e4af8c5a5c6610c19b7467..0000000000000000000000000000000000000000 Binary files a/pkg/relic/patches/0001-fixed-signedness-of-counter-variable.patch and /dev/null differ diff --git a/pkg/relic/patches/0002-don-t-redefine-ALIGN.patch b/pkg/relic/patches/0002-don-t-redefine-ALIGN.patch deleted file mode 100644 index 9cbc90ca040a4e24e47c9030c2745719cef4f61e..0000000000000000000000000000000000000000 Binary files a/pkg/relic/patches/0002-don-t-redefine-ALIGN.patch and /dev/null differ diff --git a/pkg/relic/patches/0003-require-only-CMake-version-2.8.patch b/pkg/relic/patches/0003-require-only-CMake-version-2.8.patch deleted file mode 100644 index d8be0d262f24a6946fd6583f37a60d9610345ae7..0000000000000000000000000000000000000000 Binary files a/pkg/relic/patches/0003-require-only-CMake-version-2.8.patch and /dev/null differ