mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-30 14:46:31 +00:00
tinycbor: on't download patch from Github
Patches downloaded from Github are not stable, so bring them in the tree. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
parent
7ced54845c
commit
18813dd922
@ -0,0 +1,28 @@
|
|||||||
|
From ae608ea2735bd331ec7dcf9d89928c38f0e0c981 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||||
|
Date: Mon, 6 Mar 2017 18:59:22 +0100
|
||||||
|
Subject: [PATCH] Fix static compilation of json2cbor
|
||||||
|
|
||||||
|
json2cbor depends on cjson so tools/json2cbor/json2cbor.o must be
|
||||||
|
before -lcjson
|
||||||
|
|
||||||
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||||
|
[Upstream commit: https://github.com/01org/tinycbor/commit/ae608ea2735bd331ec7dcf9d89928c38f0e0c981]
|
||||||
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||||
|
---
|
||||||
|
Makefile | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/Makefile b/Makefile
|
||||||
|
index 97b292c..a8cb57c 100644
|
||||||
|
--- a/Makefile
|
||||||
|
+++ b/Makefile
|
||||||
|
@@ -115,7 +115,7 @@ bin/cbordump: $(CBORDUMP_SOURCES:.c=.o) lib/libtinycbor.a
|
||||||
|
|
||||||
|
bin/json2cbor: $(JSON2CBOR_SOURCES:.c=.o) lib/libtinycbor.a
|
||||||
|
@$(MKDIR) -p bin
|
||||||
|
- $(CC) -o $@ $(LDFLAGS) $(LDFLAGS_CJSON) $^ $(LDLIBS) -lm
|
||||||
|
+ $(CC) -o $@ $(LDFLAGS) $^ $(LDFLAGS_CJSON) $(LDLIBS) -lm
|
||||||
|
|
||||||
|
tinycbor.pc: tinycbor.pc.in
|
||||||
|
$(SED) > $@ < $< \
|
@ -1,3 +1,2 @@
|
|||||||
# Locally computed:
|
# Locally computed:
|
||||||
sha256 8e42984015d62e8323b7f2a439bde157d707e0d7ae57a6d8d5a2665247af6638 tinycbor-v0.4.1.tar.gz
|
sha256 8e42984015d62e8323b7f2a439bde157d707e0d7ae57a6d8d5a2665247af6638 tinycbor-v0.4.1.tar.gz
|
||||||
sha256 1298b80ab23ae24e85515d9f06398236d087bc76dccd0a48757fcb7e54557175 ae608ea2735bd331ec7dcf9d89928c38f0e0c981.patch
|
|
||||||
|
@ -12,10 +12,6 @@ TINYCBOR_LICENSE_FILES = LICENSE
|
|||||||
TINYCBOR_DEPENDENCIES = host-pkgconf
|
TINYCBOR_DEPENDENCIES = host-pkgconf
|
||||||
TINYCBOR_INSTALL_STAGING = YES
|
TINYCBOR_INSTALL_STAGING = YES
|
||||||
|
|
||||||
# This patch fixes static build of json2cbor
|
|
||||||
TINYCBOR_PATCH = \
|
|
||||||
https://github.com/01org/tinycbor/commit/ae608ea2735bd331ec7dcf9d89928c38f0e0c981.patch
|
|
||||||
|
|
||||||
ifeq ($(BR2_PACKAGE_CJSON),y)
|
ifeq ($(BR2_PACKAGE_CJSON),y)
|
||||||
TINYCBOR_DEPENDENCIES += cjson
|
TINYCBOR_DEPENDENCIES += cjson
|
||||||
endif
|
endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user