From 3288f7a5ae7f83a40efee0322e1f8e595d0627b8 Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Tue, 25 Apr 2017 22:27:47 +0200
Subject: [PATCH] pkg/relic: Update to new upstream and remove patches
The removed patches have been applied upstream.
---
pkg/relic/Makefile | 12 ++++--------
pkg/relic/fix-old-style-definitions.sh | 3 ---
pkg/relic/fix-util_print_wo_args.sh | 3 ---
...01-fixed-signedness-of-counter-variable.patch | Bin 723 -> 0 bytes
.../patches/0002-don-t-redefine-ALIGN.patch | Bin 1768 -> 0 bytes
.../0003-require-only-CMake-version-2.8.patch | Bin 581 -> 0 bytes
6 files changed, 4 insertions(+), 14 deletions(-)
delete mode 100755 pkg/relic/fix-old-style-definitions.sh
delete mode 100755 pkg/relic/fix-util_print_wo_args.sh
delete mode 100644 pkg/relic/patches/0001-fixed-signedness-of-counter-variable.patch
delete mode 100644 pkg/relic/patches/0002-don-t-redefine-ALIGN.patch
delete mode 100644 pkg/relic/patches/0003-require-only-CMake-version-2.8.patch
diff --git a/pkg/relic/Makefile b/pkg/relic/Makefile
index 0e7deaf10d..cdb9e0bfda 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 752422b96c..0000000000
--- 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 a2355f3be6..0000000000
--- 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
GIT binary patch
literal 0
HcmV?d00001
literal 723
zcmZ=O%Fk7>G)uEIGBY<$Og2w4H?&MMH!-y|wJ<lfNHsGvH8Qa@OiD{LN;XbX@XgOt
z2u>|fFf>;%Ft7q61tS9kLoSdpRto+(sp$$Hi5a;HHu*WJ=?)qBNlBI2sW~~RMSA%~
z>2_Q$i6yC43c-mbItoS>3V!)z3PuKorV55;RtAPvh87Ci28IR(T*0MDS*gh-RtjmE
z6{#r-#hK}OsVRA>#l;HwX$r~trFkW(MG9q!MVX07IjLM+y1Ket3dKdq`pE_QMX5QN
z$??er@kuEKsd~u@H44TG+S<BY3Wf@4nK`Kn$r*`x>8U9?3PuW<dBv$kC7Jno#Twe0
zItqpgDXBTBAijpKCKp#qW?Gtpu5Nl}i9(`24#SghNN{E5rKDCUB%2wV85t()=@}#%
znHndWDi|6Vn3<S>+>6spE^TdX1)SzOI4I~Eni=SrD`<l#3k3%Uh0MGX1*m`HQ}dEF
zN;C6HEaFQPwDL<!bilG8R(wuso{mCFW_o;yLS~+h0w{RmOB4!9lQb2oxfHm-3Sq{i
zq$X=Xl!CPCD8P*b=>*xAnFlcsW=c^R*c8sBy!aA@TpfiH9fc}uE?rKrS{;Sr%&Jr!
zg`(8r(wq_nTZQ0|;CO#;Yc6fh(mY7qDrACqAk{dODsU-qf}|8|6_WDeL9F<s%sh>P
ZqB32(JWXpZ1uk7(1ui2!Gd&|NE&yu?+tmO7
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
GIT binary patch
literal 0
HcmV?d00001
literal 1768
zcmZ=O%Fk6WwlGXIG_o`@H8e3!N;F9`vothFHZ)C6PBKhOOiD6JG*7ljHZwF)@XgOt
z2u>|fFf>;%Ft7q61tS9kLoSdpRto+(sp$$Hi5a;HHu*WJ=?)qBNlBI2sW~~RMSA%~
z>2_Q$i6yC43c-mbItoS>3V!)z3PuKorV56pR;DIaMkWf{28IR(T*0MDS*gh-RthQk
zdFmw!MX4#NX_<Mc3XVRW?tWZcy1Ket3YmGyIi)G7`bDWZnaS}bl?AEAdKn5e3JR7A
z+7JLzRa}&;pPQnel#`g9YNVH;00A`$h6W&2x)8vnV5E?inUh+qkerd2m!6uU1Cr0o
zD^4vc$;{6y*3j0}QLt1<NzF-x@O3r0xKc9H(iC)c(=$sH67{h=CJDPZS7u&HYK1~#
zTC$0Sxq+Tuie+k=Nt&sGp@D&!i3!MexJ=~I*49?QWvYXNg07*FrH-Y7Hi$AbQE+fj
z0EJ6RYMMf6UU6o6UTTU$PJUiGgec9)i7&C{Qc%!R2rfuX&P>ZpP6T;RAuYd1Au$J{
zyezROGchSAwO9|NP@hXdIWr9s4GMM&hFrSJ(3k<MSK#F2jE_$&DJjZKDlJKkk5|yp
z086B%C}@D=PE%8pOIuk%Au~+@qA^7y-Z$7eKFl=;BB1~khuGoks!^e-5FekCnw(Qy
zkeUoJO``&8N@`AVD%d#ex{w?KcLzu>#HQ4|l*}|P1!b@ynEue$Qb^4$D5=!a2ipK~
zEhJb#-o!2q_9Mj6kc6h7pn#-OK^bZ(mx8{Q7HSGYPpC=yXd=*5lV*{alxShBr)Of3
zYHVndhMH>7^+3`Kx+plMnCloCDrg&;>zFGzIDq06lAjc8ic3;bQq%M@?9c==^Gd*i
zT)Ln%00|J}=!1tLI23S3oGx03BdNw6VY<+e(^iJ&GzBG;e6Pf%0CFu-s)|o8$SExb
zVNEWD)QXbSqC5p9XC;MdE|Bld40X&Ev`rzNN0kOgTxn)riA8*gf<i%RQE`4=VotP^
zkE6G%QE+^KYf!MipQDdcWQc2UthIuIzP^I75to93LahR%lqrrcNGwXswdPXb(p7+@
zV+{o}69r9pW-Kl#Dorj?h>wS9C@x7XN#)Xps`hmyPQ8MHLN&-@1qG0Ejg8_<6f&YM
zVnJD20ZFVR+9=i<>}v}%kgqL_z)?<uubr^^+ROxGIn38dr20B3o-|*>)T8>^%mmZd
TU@?fVb#)cEjP%U(jJUV})1w7Y
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
GIT binary patch
literal 0
HcmV?d00001
literal 581
zcmZ=O%Fk7>Ff>U_O*S_&GPFoCv@}UdNlP;|G&e9xOHNHrF-|lvGcqztO-o8q@XgOt
z2u>|fFf>;%Ft7q61tS9kLoSdpRto+(sp$$Hi5a;HHu*WJ=?)qBNlBI2sW~~RMSA%~
z>2_Q$i6yC43L&MbItqpgE~&{1Mh1qa3WnxZCPr3<W(wK{h6V;)!KF!AsmUc)3ef?M
zA<iBO#`?yw3Pq`frI|&k3i)|Cl?u+jiP@<NWvNBQnfZANMtT-pT)MitTo7@e%;J(_
zy^@L&g&GAT1#Mj}1w)0j%$!t(<c!3;^wboP)tPz4sYNB3`FR@Jnjn5kYECMctE<Vy
zm6Dm3rl6~vo>`)hs1LRZVPq1T09R&SN@|6IMWT^eT56J>o>6k5sj+#Yf}w$dnTZL=
zRTyS)X=`gMV3_0JprC80W2&GHA{-pJ6bg#+L7|`#<m%(;tl+HR91)?(rJJ0an4KD*
zo0*rHTbdgW4U`m(FxQ}9Pk%oJV?9GnE^PvejPxutxfHk*ic?E80)qU#T%AMWp$5eJ
jI(qpBDJU5zY2uLg^aIJ8C~0!(>MC#<>6z&nad80vq~fYC
--
GitLab