diff options
| author | Fabrice Fontaine <fontaine.fabrice@gmail.com> | 2017-03-06 21:56:01 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-03-10 22:24:08 +0100 |
| commit | f1f86b39546e18f21d4605dbea549490b553e3e9 (patch) | |
| tree | ea93e884542ac04d31f4ebcb34c4bb8be300bf19 /package/tinycbor/0002-Fix-static-compilation-of-json2cbor.patch | |
| parent | 7670dcc43e3b023b9bd613fa464533ecde7aca70 (diff) | |
| download | buildroot-f1f86b39546e18f21d4605dbea549490b553e3e9.tar.gz buildroot-f1f86b39546e18f21d4605dbea549490b553e3e9.zip | |
tinycbor: bump to version 1.4.1
Delete first patch as it has been integrated upstream
Retrieve second patch upstream
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/tinycbor/0002-Fix-static-compilation-of-json2cbor.patch')
| -rw-r--r-- | package/tinycbor/0002-Fix-static-compilation-of-json2cbor.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/package/tinycbor/0002-Fix-static-compilation-of-json2cbor.patch b/package/tinycbor/0002-Fix-static-compilation-of-json2cbor.patch deleted file mode 100644 index dfea4ca68f..0000000000 --- a/package/tinycbor/0002-Fix-static-compilation-of-json2cbor.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1be7da8d81bbd52d722ec60250567ea876f6f4b5 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <fabrice.fontaine@orange.com> -Date: Sat, 3 Dec 2016 20:15:41 +0100 -Subject: [PATCH] Fix static compilation of json2cbor - -json2cbor depends on cjson so tools/json2cbor/json2cbor.o must before --lcjson - -Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com> ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 905fbdf..7b5fefc 100644 ---- a/Makefile -+++ b/Makefile -@@ -115,7 +115,7 @@ bin/cbordump: $(CBORDUMP_SOURCES:.c=.o) lib/libtinycbor.a | bin - $(CC) -o $@ $(LDFLAGS) $^ $(LDLIBS) -lm - - bin/json2cbor: $(JSON2CBOR_SOURCES:.c=.o) lib/libtinycbor.a | bin -- $(CC) -o $@ $(LDFLAGS) $(LDFLAGS_CJSON) $^ $(LDLIBS) -lm -+ $(CC) -o $@ $(LDFLAGS) $^ $(LDFLAGS_CJSON) $(LDLIBS) -lm - - tinycbor.pc: tinycbor.pc.in - $(SED) > $@ < $< \ --- -2.5.0 - |
