From ee41b98ee95ee983554624cfe5f5fb2c2fb8761b Mon Sep 17 00:00:00 2001 From: Martine Lenders <mlenders@inf.fu-berlin.de> Date: Thu, 12 May 2016 16:39:03 +0200 Subject: [PATCH] libmathfix: move to git repository and adapt --- Makefile.dep | 1 + pkg/libfixmath/.gitignore | 1 - pkg/libfixmath/Makefile | 72 ++---------------- pkg/libfixmath/Makefile.include | 8 +- pkg/libfixmath/Makefile.template | 3 - pkg/libfixmath/Makefile.template-unittests | 3 - pkg/libfixmath/checkout.sh | 36 --------- .../libfixmath-unittests-printf-format.patch | Bin 5037 -> 0 bytes .../patches/0001-Move-to-RIOT-Makefiles.patch | Bin 0 -> 4972 bytes .../patches/0002-Fix-warnings.patch | Bin 0 -> 4091 bytes .../0003-Adapt-unittests-for-RIOT.patch | Bin 0 -> 8506 bytes pkg/libfixmath/perform-svn-checkout.sh | 25 ------ 12 files changed, 16 insertions(+), 133 deletions(-) delete mode 100644 pkg/libfixmath/.gitignore delete mode 100644 pkg/libfixmath/Makefile.template delete mode 100644 pkg/libfixmath/Makefile.template-unittests delete mode 100755 pkg/libfixmath/checkout.sh delete mode 100644 pkg/libfixmath/libfixmath-unittests-printf-format.patch create mode 100644 pkg/libfixmath/patches/0001-Move-to-RIOT-Makefiles.patch create mode 100644 pkg/libfixmath/patches/0002-Fix-warnings.patch create mode 100644 pkg/libfixmath/patches/0003-Adapt-unittests-for-RIOT.patch delete mode 100755 pkg/libfixmath/perform-svn-checkout.sh diff --git a/Makefile.dep b/Makefile.dep index 218e5aaa83..f1d20c5ca7 100644 --- a/Makefile.dep +++ b/Makefile.dep @@ -441,6 +441,7 @@ endif ifneq (,$(filter libfixmath-unittests,$(USEMODULE))) USEPKG += libfixmath + USEMODULE += libfixmath endif ifneq (,$(filter fib,$(USEMODULE))) diff --git a/pkg/libfixmath/.gitignore b/pkg/libfixmath/.gitignore deleted file mode 100644 index 5e660dc18e..0000000000 --- a/pkg/libfixmath/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/checkout diff --git a/pkg/libfixmath/Makefile b/pkg/libfixmath/Makefile index db72b672e7..6668796eb9 100644 --- a/pkg/libfixmath/Makefile +++ b/pkg/libfixmath/Makefile @@ -1,67 +1,11 @@ -export PKG_NAME := libfixmath -export PKG_VERSION := 91 -export PKG_BRANCH := trunk -export PKG_URL := http://libfixmath.googlecode.com/svn/$(PKG_BRANCH)/ +PKG_NAME := libfixmath +PKG_VERSION := ad9ed940e57d43432b276e95aee6ca9df6f23ccd +PKG_URL := git://github.com/PetteriAimonen/libfixmath +PKG_BUILDDIR ?= $(BINDIRBASE)/pkg/$(BOARD)/$(PKG_NAME) -export CHECKOUT_FOLDER := $(CURDIR)/checkout/$(PKG_BRANCH)-r$(PKG_VERSION) -export SVN_INFO_FILE := $(CHECKOUT_FOLDER)/svn_info.xml +.PHONY: all -.PHONY: all clean distclean +all: git-download + $(AD)$(MAKE) -C $(PKG_BUILDDIR) -all: $(BINDIR)$(PKG_NAME).a - -all-unittests: $(BINDIR)$(PKG_NAME)-unittests.a - -ifneq (,$(filter libfixmath-unittests,$(USEMODULE))) - all: all-unittests -endif - -$(BINDIR)$(PKG_NAME).a: $(BINDIR)$(PKG_NAME)-src/Makefile $(BINDIR)$(PKG_NAME)-headers/fix16.h - "$(MAKE)" -C $(<D) - -$(BINDIR)$(PKG_NAME)-unittests.a: $(BINDIR)$(PKG_NAME)-unittests-src/Makefile $(BINDIR)$(PKG_NAME)-headers/fix16.h - "$(MAKE)" -C $(<D) - -$(BINDIR)$(PKG_NAME)-src/Makefile: $(CHECKOUT_FOLDER)/svn_info.xml - $(AD)rm -rf $(@D) - $(AD)mkdir -p $(@D) - $(AD)cp $(CURDIR)/Makefile.template $@ - $(AD)cp $(CHECKOUT_FOLDER)/libfixmath/*.[ch] $(@D) - $(AD)rm -f $(BINDIR)$(PKG_NAME)-src/fix16.h - - $(AD)cd $(@D) && sed -i -e 's/1 <</(uint32_t) 1 <</g' uint32.c - $(AD)cd $(@D) && sed -i -e 's/is\([a-z]*\)(\*buf)/is\1((unsigned char) *buf)/g' fix16_str.c - -$(BINDIR)$(PKG_NAME)-unittests-src/Makefile: $(CHECKOUT_FOLDER)/svn_info.xml - $(AD)rm -rf $(@D) - $(AD)mkdir -p $(@D) - $(AD)cp $(CURDIR)/Makefile.template-unittests $@ - $(AD)cp $(CHECKOUT_FOLDER)/unittests/*.[ch] $(@D) - - $(AD)cd $(@D) && for C_FILE in *.[ch]; do \ - sed -e "s/int main()/int $$(basename $${C_FILE} .c)(void)/" \ - -e '/fflush/d' \ - -e 's/fprintf(std[^,]*,/printf(/' \ - -i $${C_FILE}; \ - done - $(AD)cd $(@D) && patch -p1 --ignore-whitespace < $(CURDIR)/libfixmath-unittests-printf-format.patch - -$(BINDIR)$(PKG_NAME)-headers/fix16.h: $(CHECKOUT_FOLDER)/svn_info.xml - $(AD)rm -rf $(@D) - $(AD)mkdir -p $(@D) - $(AD)cp $(CHECKOUT_FOLDER)/libfixmath/fix16.h $(@D) - $(AD)echo $(patsubst %,'extern int %(void);',$(shell for f in $(CHECKOUT_FOLDER)/unittests/*.c; do basename $${f} .c; done )) \ - $(patsubst %,'%();',$(shell for f in $(CHECKOUT_FOLDER)/unittests/*.c; do basename $${f} .c; done)) | sed -e 's/;\s*/;\n/g' > $(@D)/fix16_unittests.inc - -$(SVN_INFO_FILE): - $(AD)mkdir -p $(@D) - $(AD)$(CURDIR)/checkout.sh - -clean:: - $(AD)rm -rf $(BINDIR)$(PKG_NAME)-src/ $(BINDIR)$(PKG_NAME)-headers/ - -distclean:: clean - $(AD)rm -rf $(CHECKOUT_FOLDER) - -Makefile.include: - @true +include $(RIOTBASE)/pkg/pkg.mk diff --git a/pkg/libfixmath/Makefile.include b/pkg/libfixmath/Makefile.include index 147ba409f3..0ce160429e 100644 --- a/pkg/libfixmath/Makefile.include +++ b/pkg/libfixmath/Makefile.include @@ -1,4 +1,10 @@ +PKG_BUILDDIR ?= $(BINDIRBASE)/pkg/$(BOARD)/libfixmath + # The static cache is huge, disable it. CFLAGS += -DFIXMATH_NO_CACHE -INCLUDES += -I$(BINDIR)libfixmath-headers/ +INCLUDES += -I$(PKG_BUILDDIR)/libfixmath + +ifneq (,$(filter libfixmath-unittests,$(USEMODULE))) + INCLUDES += -I$(PKG_BUILDDIR)/unittests +endif diff --git a/pkg/libfixmath/Makefile.template b/pkg/libfixmath/Makefile.template deleted file mode 100644 index c875b98543..0000000000 --- a/pkg/libfixmath/Makefile.template +++ /dev/null @@ -1,3 +0,0 @@ -MODULE = libfixmath - -include $(RIOTBASE)/Makefile.base diff --git a/pkg/libfixmath/Makefile.template-unittests b/pkg/libfixmath/Makefile.template-unittests deleted file mode 100644 index 245ffb9416..0000000000 --- a/pkg/libfixmath/Makefile.template-unittests +++ /dev/null @@ -1,3 +0,0 @@ -MODULE = libfixmath-unittests - -include $(RIOTBASE)/Makefile.base diff --git a/pkg/libfixmath/checkout.sh b/pkg/libfixmath/checkout.sh deleted file mode 100755 index 4578af79a4..0000000000 --- a/pkg/libfixmath/checkout.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env bash - -if [ -z "${CHECKOUT_FOLDER}" ]; then - echo 'export CHECKOUT_FOLDER before running this script' >&2 - exit 2 -fi - -: ${CHECKOUT_LOCKFILE:=${CHECKOUT_FOLDER}/.riot-svn-checkout-lockfile} -# Default timeout, in seconds -: ${LOCK_TIMEOUT:=120} - -# We need to protect SVN checkout with a lock to avoid parallel make runs from -# disrupting each other -if type flock >/dev/null 2>&1; then - # Try flock(1) command first, usually found on Linux - ( - flock -w "${LOCK_TIMEOUT}" 200 || ( - echo "Timed out waiting to acquire lock ${CHECKOUT_LOCKFILE}" >&2 - exit 1 - ) - $(dirname "$0")/perform-svn-checkout.sh - exit $? - ) 200>"${CHECKOUT_LOCKFILE}" -elif type lockf >/dev/null 2>&1; then - # lockf is usually installed on FreeBSD and OSX - lockf -t ${LOCK_TIMEOUT} ${CHECKOUT_LOCKFILE} $(dirname "$0")/perform-svn-checkout.sh - exit $? -else - # flock(1) and lockf(1) shell commands are missing from the system - echo 'Missing both flock(1) and lockf(1),' - echo 'flock is part of util-linux on most Linux systems, lockf is usually installed on FreeBSD.' - echo 'see https://github.com/discoteq/flock for a portable alternative.' - echo 'Proceeding with svn checkout without locking...' - $(dirname "$0")/perform-svn-checkout.sh - exit $? -fi diff --git a/pkg/libfixmath/libfixmath-unittests-printf-format.patch b/pkg/libfixmath/libfixmath-unittests-printf-format.patch deleted file mode 100644 index 88ee69c00e2b087de34da2e2dac35e14f4c28c16..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5037 zcmd6rZExE)5Xax^Q(RjZkf(=8vLid&TC^`(Y(TpJUC{1D07JG!SC}Gs5|soP^4)hN zMVeG(&q>{;0V3KG?~eN2@$zTVoDlH5bxt8UA^B|>FWNGvG;3(%uV8uqo|Ttrb_-|m z@-zuU-#;Z2az-);gCL$xEzk3YJXwz840?P08oV$F-5EGyz#Dl<p|=+My2{hB1^Um6 zoZwOjy!-vH4{t7hTl{gpIREta<Gc6gpUsIm0lUtcwxICrW#_rN&T3LrH$9*KTAm&P zU{m92i2eMs9HsCR;6++OSy4zcnyqM-KD#WRyO6lB9RFfDJ6#mq2VVC$v5Tr)kI|L* zz#N+XfFya*;tM%W@6nw(^F>ysIk5!dGk4Aqv*B>WtE!}V*=9zZJ4=UjAJ9vrq;R+( z$m3gRWTnxFFs1~Q3BmU!OZ-(<8cb=0xlka{vJlbw+$6w#p0xO#7r6l8ZMzID1%vn% z`a8jU7W0zk!{NNYe@UMlp`_8r6O?omMGUbReq_YX5fGz~r$9UjSl5X7a5&<Jb`1_l zwE)&c|F>(P$>X|)0QuEjL&iUD*NEadFKIp;&ing!4etmgjXs{Dq_HEjlIFwVh#y+g z9MHo`8ciNo(gNgHm$Zz3+>)L|A>%EEy}YG%VQMYS3Yys6UtiS>;1ygYw+sGI={8NV zZS{drkIg?dwMXfAD=)COC^?|yh%^(^i8h^!0cD_+h%~q?^*DtHG^|E;JJF+R=y&Rm z0rk;ok2?$1USG{Ov>sISz5AW2U(JFvi38tX%~En2$3v>VZ>cN${xeLtcQ$duDL7&< zD!`cCDSTN4LT|BJz*(!SjlHg_blDOY*x3X>jG2}XR2hi*S}{n$CX@9kDcTHdkuf?( zA-_(pGZ-~4G+(L~ThWqz<HGft%~g?H=wjcO_S^G8-#z-<?O!B!cNDpHHCBIP4U?p3 zOeGG0T3k(HAG+6rx@yam*7=6n@napStE&aFv?V`7(*y8BlCna!e0hiS{itkNg=Xo` z25avXvIV?q2^d7J7QPSmzE}u;AegZ$``|@7^vDKN_GMoJ26kO`yBXYdz5Cs+3&J=G zQsVpZ>3lVxO@?+|-%{Uo{by{~P5F_UUyVIy%pE#auP~3)I9clFJ-M4cS9QZqzu2ak z6u8Oh7d*CaT8iIzUR9%Z;fBrC(>dq_^QL<-5~ev5xsonbo}|k+c&ty>nOs@mM}#lO z#<PAx$4z?$C%|737qs0v7jOT(uvHZJ6`~-(2@K>sV3Leqzd6XjpOVqY;P6PA1D-mf n>MiB@_;8kNah&GC7{d-?7>fV!@Zp<dG%M+m1b?)8M3Vmjr-@N8 diff --git a/pkg/libfixmath/patches/0001-Move-to-RIOT-Makefiles.patch b/pkg/libfixmath/patches/0001-Move-to-RIOT-Makefiles.patch new file mode 100644 index 0000000000000000000000000000000000000000..7075acd4a55f2a60b42faceb5227dad6a601a190 GIT binary patch literal 4972 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 literal 0 HcmV?d00001 diff --git a/pkg/libfixmath/patches/0002-Fix-warnings.patch b/pkg/libfixmath/patches/0002-Fix-warnings.patch new file mode 100644 index 0000000000000000000000000000000000000000..b2f028273fa5b22c4b6fdf6015c5ebd1aa06c3a0 GIT binary patch literal 4091 zcmcInZExE)5dK^O{SQ|UXr$PZCE2lKI|)*>4OXmahb8EjW-w%lv^mI9pqC^?+yA~h zO4f@b*9ou@fn?tCIUXNAM==+1w1x$DhQb@$_TXqZ@rPpUA1_A2b$sDWj(y<|Mq*+6 z{tzys5U%(w*kiD)srm!QvTSyNVWx2D#;FWBeB`0e;{;CDt_;rCxzz}AtI4x7_RdZD z6s}iU4{Qf<-!P0l0(&&I#?!$ObS(_auCm2H+)JnM_0KogZ+{1;KlmFi<OAHhaVW!O z!kA$g3<9|j@?q_!t3JN%(L70G(}Sx0062y&HXPm@pUE&CIE}#w`vJD4#w!3KvQVZe zPtv4c&1IBEb47@J2AZX6b!2^bm0FIZyqb-{5QGeP0^Z6Em)!4xGX@zZ9664{MC<Cx z;`4y#2194y#T=Q1b>wqgf;Acr_omK3h1dnEWzCo`g#g1?$`srh6AjiEI~+`+C?0?d zF|kI%G#$@!JjX85q>bDelOdt7Gw%607)O)d7`p0--MdKoNFFI6jYtey(SbWR$as$^ zjp1;Si5@bVA_1OUyFr2kvJI|y3lz4B;34N}1;nA>nL*olzrtMtO(w~$>v4^u>N@MT zxU?)x<TB*G3Ztt8aA>IoM0UHgyq`b&hwzSjw3+FO1A*bN&uGD8ix#Y&*xf8IfBzz9 znyVQU*Uy(chFh#s3a+xrt74uKJIZkiR*@L-<wY4jm90sEFHsup6y&a7QSiNDVl(aG zDaxamm=fFAyQhjgRD}Tt*1=3sGEtPM=W{8c*wyUi>P75&Tg#`Br9bgp+<MG$mP>)0 zr5tKp!0XqLk3Au|V=DyG0%&EZEdXIvtMNwte4=gU$Wtz-aFUK}Yd}KEU(cltmGp(j zQhY;sx+!Ti<{%RYBUrle!d-F*xJV(oLxF9yRS-mV0<TWt;Kn*AYM>}6N>vKbUdd#O zL$o|DvPZ*rGFZY}N7M?DLdHDJ;;^VJT7U?m`<fIhxfEr)>ufB)FpUFjV=Yca{LWhL zVq%(}?fTwO>^v1q+@mA0^w74Bdh`KPPweI{Ea&1!5G@_8G|KRc8|ZkP!3!xg)q_(k zZv7=%UKBi7GwPL?l&^0;XZacMk{K27>=ZN`PEh9~9b;m}VsJP^vpt%@28Q)Z-Jk7H zINpN7aRW--UC`k+bl8MqcNf&zhB{3sc6UK-1tr;3t+rM?APCxR(p2t%4$on1Pn0K; zw=c@mc-$A|X_W4Z@-%i~Bh`X<5-gJ5D9iFPQ@f)yu5pY0z9B5+_joGcxnH|v6;-T` zcFQu&h3g%SeMent`aZwwhglF5x0t;XQ2kmxEML2acgpi~*8NR}UXbA};3P?X8JVjy z)<vt&1>Lsae!jeX|LIzL(BU@5FQm{qHz8dnJMaJ<`f(F>^jQVCy8ep>|Mt)@Ib_RS zmHqntl?r^5Uue{^jN_=X3lj-mh#*T=8YUNIsXl9W@i^Xc71<&TeLd*hScAdWfjzU= z7jHg%eE)8$430A!OxDnW`TPQ{^Eq^;9ZJ;E=JSsqKA}ZNZwJ?dA!w!b`IFR5vqXKP zH|C$fgM|MVD=6t!i94A1=RdZRew5Tt+PYn;EVY6EQPibav$OoRPWRhZ4HnWf%|eXD z#k!183EW&MMOOMG;VI2^Nq#6iqeXZITAwMr5>N@RZmJ8fv{%AYH_WE+l&M{KEv}95 qD%bxgymFGJ@RYeGymHv%(rIx$TER1gm(R{{>rf5A9CK_A8T%JTWNQQf literal 0 HcmV?d00001 diff --git a/pkg/libfixmath/patches/0003-Adapt-unittests-for-RIOT.patch b/pkg/libfixmath/patches/0003-Adapt-unittests-for-RIOT.patch new file mode 100644 index 0000000000000000000000000000000000000000..329a8466aa1a4b12bcdfe1f02da5672ae67757fd GIT binary patch literal 8506 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 literal 0 HcmV?d00001 diff --git a/pkg/libfixmath/perform-svn-checkout.sh b/pkg/libfixmath/perform-svn-checkout.sh deleted file mode 100755 index 426a42733a..0000000000 --- a/pkg/libfixmath/perform-svn-checkout.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash -if [ -z "${PKG_URL}" ]; then - echo 'export PKG_URL before running this script' >&2 - exit 2 -fi -if [ -z "${CHECKOUT_FOLDER}" ]; then - echo 'export CHECKOUT_FOLDER before running this script' >&2 - exit 2 -fi - -: ${SVN_INFO_FILE:=${CHECKOUT_FOLDER}/svn_info.xml} - -if [ -s "${SVN_INFO_FILE}" ]; then - # svn checkout was completed by another thread while we waited for the lock - if [ "${QUIET}" -ne 1 ]; then - echo "File already exists: ${SVN_INFO_FILE}, skipping svn checkout" - fi - exit 0 -fi -if [ -n "${PKG_VERSION}" ]; then - svn checkout -q -r ${PKG_VERSION} ${PKG_URL} ${CHECKOUT_FOLDER} -else - svn checkout -q ${PKG_URL} ${CHECKOUT_FOLDER} -fi -svn info --xml ${CHECKOUT_FOLDER} > ${SVN_INFO_FILE} -- GitLab