devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix host build of mkimxboot, mknwzboot, nwztools, and rbutil with crypto++

Browse source 
Necessary to get working builds on my Fedora 29 system.

Change-Id: Ia6232427c959629ade9a85fc412738f688facedb
This commit is contained in:
Solomon Peachy 2019-01-24 07:31:07 -05:00
parent 9605237349
commit 07084f62c4
6 changed files with 53 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
rbutil/mkimxboot/Makefile
View file

@ -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

18
rbutil/mknwzboot/Makefile
View file

@ -12,7 +12,21 @@ CFLAGS += -I$(UPGTOOLS_DIR) -Wall
CFLAGS += -std=gnu99 -g -O3
# dependencies
# FIXME make it work for windows and maybe embed crypto++
LDOPTS += `pkg-config --libs libcrypto++`
# 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.
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 = mknwzboot
@ -23,7 +37,7 @@ LIBSOURCES := mknwzboot.c install_script.c uninstall_script.c \
# inputs for binary only
SOURCES := $(LIBSOURCES) main.c
# dependencies for binary
EXTRADEPS :=
EXTRADEPS :=
include ../libtools.make

4
rbutil/rbutilqt/rbutilqt.pro
View file

@ -135,6 +135,9 @@ for(rblib, RBLIBS) {
LIBS += -l$$rblib
}
# We need libcrypto++
LIBS += -lcryptopp
# on win32 libz is linked implicitly.
!win32 {
LIBS += -lz
@ -264,4 +267,3 @@ unix {
include(rbutilqt.pri)
include(quazip/quazip.pri)
include(logger/logger.pri)