summaryrefslogtreecommitdiffstats
path: root/rbutil/mkimxboot
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2019-01-24 07:31:07 -0500
committerSolomon Peachy <pizza@shaftnet.org>2019-01-25 12:58:18 +0100
commit07084f62c40d3197f3a11ac4e5fbe3b923e9ae1e (patch)
tree89eaf3845056d5c4b0b8e86799f4bb6602e6ab03 /rbutil/mkimxboot
parent96052373490095cd02fca7eb6ccdcfabe6403803 (diff)
downloadrockbox-07084f62c40d3197f3a11ac4e5fbe3b923e9ae1e.tar.gz
rockbox-07084f62c40d3197f3a11ac4e5fbe3b923e9ae1e.tar.bz2
rockbox-07084f62c40d3197f3a11ac4e5fbe3b923e9ae1e.zip
Fix host build of mkimxboot, mknwzboot, nwztools, and rbutil with crypto++
Necessary to get working builds on my Fedora 29 system. Change-Id: Ia6232427c959629ade9a85fc412738f688facedb
Diffstat (limited to 'rbutil/mkimxboot')
-rw-r--r--rbutil/mkimxboot/Makefile12
1 files changed, 10 insertions, 2 deletions
diff --git a/rbutil/mkimxboot/Makefile b/rbutil/mkimxboot/Makefile
index b584084811..9ad21a1966 100644
--- a/rbutil/mkimxboot/Makefile
+++ b/rbutil/mkimxboot/Makefile
@@ -6,17 +6,26 @@
# \/ \/ \/ \/ \/
# We use the SB code available in the Rockbox utils/sbtools directory
+
IMXTOOLS_DIR=../../utils/imxtools/sbtools/
CFLAGS += -I$(IMXTOOLS_DIR) -Wall
# std=gnu99 is required by MinGW on Windows (c99 is sufficient for Linux / MXE)
CFLAGS += -std=gnu99 -g -O3
+# Location to pkg-config binary.
+PKGCONFIG := pkg-config
+
# Distros could use different names for the crypto library. We try a list
# of candidate names, only one of them should be the valid one.
-PKGCONFIG := $(CROSS)pkg-config
LIBCRYPTO_NAMES = libcryptopp libcrypto++ cryptopp crypto++
+
$(foreach l,$(LIBCRYPTO_NAMES),\
$(eval LDOPTS += $(shell $(PKGCONFIG) --silence-errors --libs $(l))))
+$(foreach l,$(LIBCRYPTO_NAMES),\
+ $(eval CFLAGS += $(shell $(PKGCONFIG) --silence-errors --cflags $(l))))
+$(foreach l,$(LIBCRYPTO_NAMES),\
+ $(eval CXXFLAGS += $(shell $(PKGCONFIG) --silence-errors --cflags $(l))))
+LDOPTS += -lpthread
OUTPUT = mkimxboot
@@ -34,4 +43,3 @@ include ../libtools.make
# explicit dependencies on dualboot.{c,h} and mkimxboot.h
$(OBJDIR)mkimxboot.o: dualboot.h dualboot.c mkimxboot.c mkimxboot.h
$(OBJDIR)main.o: dualboot.h dualboot.c main.c mkimxboot.h
-