0001-Fix-static-compilation-of-json2cbor.patch 1020 B

12345678910111213141516171819202122232425262728
  1. From ae608ea2735bd331ec7dcf9d89928c38f0e0c981 Mon Sep 17 00:00:00 2001
  2. From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  3. Date: Mon, 6 Mar 2017 18:59:22 +0100
  4. Subject: [PATCH] Fix static compilation of json2cbor
  5. json2cbor depends on cjson so tools/json2cbor/json2cbor.o must be
  6. before -lcjson
  7. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  8. [Upstream commit: https://github.com/01org/tinycbor/commit/ae608ea2735bd331ec7dcf9d89928c38f0e0c981]
  9. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  10. ---
  11. Makefile | 2 +-
  12. 1 file changed, 1 insertion(+), 1 deletion(-)
  13. diff --git a/Makefile b/Makefile
  14. index 97b292c..a8cb57c 100644
  15. --- a/Makefile
  16. +++ b/Makefile
  17. @@ -115,7 +115,7 @@ bin/cbordump: $(CBORDUMP_SOURCES:.c=.o) lib/libtinycbor.a
  18. bin/json2cbor: $(JSON2CBOR_SOURCES:.c=.o) lib/libtinycbor.a
  19. @$(MKDIR) -p bin
  20. - $(CC) -o $@ $(LDFLAGS) $(LDFLAGS_CJSON) $^ $(LDLIBS) -lm
  21. + $(CC) -o $@ $(LDFLAGS) $^ $(LDFLAGS_CJSON) $(LDLIBS) -lm
  22. tinycbor.pc: tinycbor.pc.in
  23. $(SED) > $@ < $< \