riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pkg/jsmn: bump version, remove Makefile patch

Browse Source
This commit is contained in:
Kaspar Schleiser 2018-02-01 11:53:41 +01:00
parent ef20fe7bb3
commit f15be48cea
3 changed files with 5 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/jsmn/Makefile
View File

@ -1,11 +1,11 @@
PKG_NAME=jsmn PKG_NAME=jsmn
PKG_URL=https://github.com/zserge/jsmn PKG_URL=https://github.com/zserge/jsmn
PKG_VERSION=b77d84ba48e057aa464b6c6b6f6209e632918cb3 PKG_VERSION=6784c826d9674915a4d89649c6288e6aecb4110d
PKG_LICENSE=MIT PKG_LICENSE=MIT
.PHONY: all .PHONY: all
all: git-download all: git-download
"$(MAKE)" -C $(PKG_BUILDDIR) "$(MAKE)" -C $(PKG_BUILDDIR) -f $(CURDIR)/Makefile.jsmn
include $(RIOTBASE)/pkg/pkg.mk include $(RIOTBASE)/pkg/pkg.mk

3
pkg/jsmn/Makefile.jsmn Normal file
View File

@ -0,0 +1,3 @@
SRCS := jsmn.c
include $(RIOTBASE)/Makefile.base

60
pkg/jsmn/patches/0001-RIOTize-makefile.patch
View File

@ -1,60 +0,0 @@
From e0558697ce92e6d1af952ebcd0fa2a44c24948e0 Mon Sep 17 00:00:00 2001
From: Kaspar Schleiser <kaspar@schleiser.de>
Date: Wed, 30 Mar 2016 14:27:26 +0200
Subject: [PATCH] RIOTize makefile
---
Makefile | 42 ++----------------------------------------
1 file changed, 2 insertions(+), 40 deletions(-)
diff --git a/Makefile b/Makefile
index a382d64..64ef249 100644
--- a/Makefile
+++ b/Makefile
@@ -1,41 +1,3 @@
-# You can put your build options here
--include config.mk
-
-all: libjsmn.a
-
-libjsmn.a: jsmn.o
- $(AR) rc $@ $^
-
-%.o: %.c jsmn.h
- $(CC) -c $(CFLAGS) $< -o $@
-
-test: test_default test_strict test_links test_strict_links
-test_default: test/tests.c
- $(CC) $(CFLAGS) $(LDFLAGS) $< -o test/$@
- ./test/$@
-test_strict: test/tests.c
- $(CC) -DJSMN_STRICT=1 $(CFLAGS) $(LDFLAGS) $< -o test/$@
- ./test/$@
-test_links: test/tests.c
- $(CC) -DJSMN_PARENT_LINKS=1 $(CFLAGS) $(LDFLAGS) $< -o test/$@
- ./test/$@
-test_strict_links: test/tests.c
- $(CC) -DJSMN_STRICT=1 -DJSMN_PARENT_LINKS=1 $(CFLAGS) $(LDFLAGS) $< -o test/$@
- ./test/$@
-
-jsmn_test.o: jsmn_test.c libjsmn.a
-
-simple_example: example/simple.o libjsmn.a
- $(CC) $(LDFLAGS) $^ -o $@
-
-jsondump: example/jsondump.o libjsmn.a
- $(CC) $(LDFLAGS) $^ -o $@
-
-clean:
- rm -f jsmn.o jsmn_test.o example/simple.o
- rm -f libjsmn.a
- rm -f simple_example
- rm -f jsondump
-
-.PHONY: all clean test
+SRCS := jsmn.c
+include $(RIOTBASE)/Makefile.base
--
2.7.4