openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-28 15:33:42 +02:00
Code Issues Releases Wiki Activity

Makefile: Make pkg-config mandatory to find libjaylink

Browse Source 
Use `make HAS_LIBJAYLINK=yes/no` to override the pkg-config detection
and `CONFIG_LIBJAYLINK_CFLAGS` and `CONFIG_LIBJAYLINK_LDFLAGS` to set
cflags and ldflags manually.

Change-Id: I99df547046bb9820ab502f89f6d4452c1bc0cfd4
Signed-off-by: Thomas Heijligen <thomas.heijligen@secunet.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/59048
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
Thomas Heijligen 2021-11-05 10:34:31 +01:00 committed by Nico Huber
parent 41f20c749e
commit 82524f8411
2 changed files with 20 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
Makefile
View File

@ -186,6 +186,9 @@ CONFIG_NI845X_LIBRARY_PATH := '${PROGRAMFILES}\National Instruments\NI-845x\MS V
CONFIG_LIB_NI845X_CFLAGS := -I$(CONFIG_NI845X_LIBRARY_PATH) $(if NI854_X86_LIBRARY_PATH, -I${NI854_X86_LIBRARY_PATH}) CONFIG_LIB_NI845X_CFLAGS := -I$(CONFIG_NI845X_LIBRARY_PATH) $(if NI854_X86_LIBRARY_PATH, -I${NI854_X86_LIBRARY_PATH})
CONFIG_LIB_NI845X_LDFLAGS := -L$(CONFIG_NI845X_LIBRARY_PATH) $(if NI854_X86_LIBRARY_PATH, -L${NI854_X86_LIBRARY_PATH}) -lni845x CONFIG_LIB_NI845X_LDFLAGS := -L$(CONFIG_NI845X_LIBRARY_PATH) $(if NI854_X86_LIBRARY_PATH, -L${NI854_X86_LIBRARY_PATH}) -lni845x
CONFIG_LIBJAYLINK_CFLAGS := $(call dependency_cflags, libjaylink)
CONFIG_LIBJAYLINK_LDFLAGS := $(call dependency_ldflags, libjaylink)
# Determine the destination OS, architecture and endian # Determine the destination OS, architecture and endian
# IMPORTANT: The following lines must be placed before TARGET_OS, ARCH or ENDIAN # IMPORTANT: The following lines must be placed before TARGET_OS, ARCH or ENDIAN
# is ever used (of course), but should come after any lines setting CC because # is ever used (of course), but should come after any lines setting CC because
@ -197,6 +200,7 @@ override ENDIAN := $(call c_macro_test, Makefile.d/endian_test.h)
HAS_LIBFTDI1 := $(call find_dependency, libftdi1) HAS_LIBFTDI1 := $(call find_dependency, libftdi1)
HAS_LIB_NI845X := no HAS_LIB_NI845X := no
HAS_LIBJAYLINK := $(call find_dependency, libjaylink)
HAS_FT232H := $(call c_compile_test, Makefile.d/ft232h_test.c, $(CONFIG_LIBFTDI1_CFLAGS)) HAS_FT232H := $(call c_compile_test, Makefile.d/ft232h_test.c, $(CONFIG_LIBFTDI1_CFLAGS))
HAS_UTSNAME := $(call c_compile_test, Makefile.d/utsname_test.c) HAS_UTSNAME := $(call c_compile_test, Makefile.d/utsname_test.c)
@ -228,7 +232,7 @@ LIBS += -lgetopt
# Missing serial support. # Missing serial support.
$(call mark_unsupported,$(DEPENDS_ON_SERIAL)) $(call mark_unsupported,$(DEPENDS_ON_SERIAL))
# Libraries not available for DOS # Libraries not available for DOS
$(call mark_unsupported,$(DEPENDS_ON_LIBUSB1) $(DEPENDS_ON_LIBJAYLINK)) $(call mark_unsupported,$(DEPENDS_ON_LIBUSB1))
endif endif
ifeq ($(TARGET_OS), $(filter $(TARGET_OS), MinGW Cygwin)) ifeq ($(TARGET_OS), $(filter $(TARGET_OS), MinGW Cygwin))
@ -264,7 +268,7 @@ $(call mark_unsupported,CONFIG_ATAPROMISE)
# Bus Pirate, Serprog and PonyProg are not supported with libpayload (missing serial support). # Bus Pirate, Serprog and PonyProg are not supported with libpayload (missing serial support).
$(call mark_unsupported,CONFIG_BUSPIRATE_SPI CONFIG_SERPROG CONFIG_PONY_SPI) $(call mark_unsupported,CONFIG_BUSPIRATE_SPI CONFIG_SERPROG CONFIG_PONY_SPI)
# Dediprog, Developerbox, USB-Blaster, PICkit2, CH341A and FT2232 are not supported with libpayload (missing libusb support). # Dediprog, Developerbox, USB-Blaster, PICkit2, CH341A and FT2232 are not supported with libpayload (missing libusb support).
$(call mark_unsupported,$(DEPENDS_ON_LIBUSB1) $(DEPENDS_ON_LIBJAYLINK)) $(call mark_unsupported,$(DEPENDS_ON_LIBUSB1))
endif endif
ifeq ($(HAS_LINUX_MTD), no) ifeq ($(HAS_LINUX_MTD), no)
@ -297,6 +301,10 @@ ifeq ($(HAS_LIB_NI845X), no)
$(call mark_unsupported,$(DEPENDS_ON_LIB_NI845X)) $(call mark_unsupported,$(DEPENDS_ON_LIB_NI845X))
endif endif
ifeq ($(HAS_LIBJAYLINK), no)
$(call mark_unsupported,$(DEPENDS_ON_LIBJAYLINK))
endif
ifeq ($(ENDIAN), little) ifeq ($(ENDIAN), little)
FEATURE_CFLAGS += -D'__FLASHROM_LITTLE_ENDIAN__=1' FEATURE_CFLAGS += -D'__FLASHROM_LITTLE_ENDIAN__=1'
endif endif
@ -844,11 +852,10 @@ override CFLAGS += $(CONFIG_LIB_NI845X_CFLAGS)
override LDFLAGS += $(CONFIG_LIB_NI845X_LDFLAGS) override LDFLAGS += $(CONFIG_LIB_NI845X_LDFLAGS)
endif endif
NEED_LIBJAYLINK := $(call filter_deps,$(DEPENDS_ON_LIBJAYLINK)) USE_LIBJAYLINK := $(if $(call filter_deps,$(DEPENDS_ON_LIBJAYLINK)),yes,no)
ifneq ($(NEED_LIBJAYLINK), ) ifeq ($(USE_LIBJAYLINK), yes)
CHECK_LIBJAYLINK = yes override CFLAGS += $(CONFIG_LIBJAYLINK_CFLAGS)
JAYLINKLIBS += $(call debug_shell,[ -n "$(PKG_CONFIG_LIBDIR)" ] && export PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)"; $(PKG_CONFIG) --libs libjaylink) override LDFLAGS += $(CONFIG_LIBJAYLINK_LDFLAGS)
override CPPFLAGS += $(call debug_shell,[ -n "$(PKG_CONFIG_LIBDIR)" ] && export PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)"; $(PKG_CONFIG) --cflags-only-I libjaylink)
endif endif
ifeq ($(CONFIG_PRINT_WIKI), yes) ifeq ($(CONFIG_PRINT_WIKI), yes)
@ -877,7 +884,7 @@ ifeq ($(ARCH), x86)
endif endif
$(PROGRAM)$(EXEC_SUFFIX): $(OBJS) $(PROGRAM)$(EXEC_SUFFIX): $(OBJS)
$(CC) -o $(PROGRAM)$(EXEC_SUFFIX) $(OBJS) $(LDFLAGS) $(LIBS) $(PCILIBS) $(FEATURE_LIBS) $(USBLIBS) $(USB1LIBS) $(JAYLINKLIBS) $(CC) -o $(PROGRAM)$(EXEC_SUFFIX) $(OBJS) $(LDFLAGS) $(LIBS) $(PCILIBS) $(FEATURE_LIBS) $(USBLIBS) $(USB1LIBS)
libflashrom.a: $(LIBFLASHROM_OBJS) libflashrom.a: $(LIBFLASHROM_OBJS)
$(AR) rcs $@ $^ $(AR) rcs $@ $^
@ -978,28 +985,11 @@ ifeq ($(CHECK_LIBUSB1), yes)
rm -f .test.c .test.o .test$(EXEC_SUFFIX); exit 1; }; } 2>>$(BUILD_DETAILS_FILE); echo $? >&3 ; } | tee -a $(BUILD_DETAILS_FILE) >&4; } 3>&1;} | { read rc ; exit ${rc}; } } 4>&1 rm -f .test.c .test.o .test$(EXEC_SUFFIX); exit 1; }; } 2>>$(BUILD_DETAILS_FILE); echo $? >&3 ; } | tee -a $(BUILD_DETAILS_FILE) >&4; } 3>&1;} | { read rc ; exit ${rc}; } } 4>&1
@rm -f .test.c .test.o .test$(EXEC_SUFFIX) @rm -f .test.c .test.o .test$(EXEC_SUFFIX)
endif endif
ifeq ($(CHECK_LIBJAYLINK), yes) @echo Dependency libjaylink found: $(HAS_LIBJAYLINK)
@printf "Checking for libjaylink headers... " | tee -a $(BUILD_DETAILS_FILE) @if [ $(HAS_LIBJAYLINK) = yes ]; then \
@echo "$$LIBJAYLINK_TEST" > .test.c echo " CFLAGS: $(CONFIG_LIBJAYLINK_CFLAGS)"; \
@printf "\nexec: %s\n" "$(CC) -c $(CPPFLAGS) $(CFLAGS) .test.c -o .test.o" >>$(BUILD_DETAILS_FILE) echo " LDFLAGS: $(CONFIG_LIBJAYLINK_LDFLAGS)"; \
@{ { { { { $(CC) -c $(CPPFLAGS) $(CFLAGS) .test.c -o .test.o >&2 && \ fi
echo "found." || { echo "not found."; echo; \
echo "The following feature requires libjaylink: $(NEED_LIBJAYLINK)."; \
echo "Please install libjaylink headers or disable the feature"; \
echo "mentioned above by specifying make CONFIG_JLINK_SPI=no"; \
echo "See README for more information."; echo; \
rm -f .test.c .test.o; exit 1; }; } 2>>$(BUILD_DETAILS_FILE); echo $? >&3 ; } | tee -a $(BUILD_DETAILS_FILE) >&4; } 3>&1;} | { read rc ; exit ${rc}; } } 4>&1
@printf "Checking if libjaylink is usable... " | tee -a $(BUILD_DETAILS_FILE)
@printf "\nexec: %s\n" "$(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(JAYLINKLIBS)" >>$(BUILD_DETAILS_FILE)
@{ { { { { $(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(JAYLINKLIBS) >&2 && \
echo "yes." || { echo "no."; \
echo "The following feature requires libjaylink: $(NEED_LIBJAYLINK)."; \
echo "Please install libjaylink or disable the feature"; \
echo "mentioned above by specifying make CONFIG_JLINK_SPI=no"; \
echo "See README for more information."; echo; \
rm -f .test.c .test.o .test$(EXEC_SUFFIX); exit 1; }; } 2>>$(BUILD_DETAILS_FILE); echo $? >&3 ; } | tee -a $(BUILD_DETAILS_FILE) >&4; } 3>&1;} | { read rc ; exit ${rc}; } } 4>&1
@rm -f .test.c .test.o .test$(EXEC_SUFFIX)
endif
@echo Dependency NI-845x found: $(HAS_LIB_NI845X) @echo Dependency NI-845x found: $(HAS_LIB_NI845X)
@if [ $(HAS_LIB_NI845X) = yes ]; then \ @if [ $(HAS_LIB_NI845X) = yes ]; then \
echo " CFLAGS: $(CONFIG_LIB_NI845X_CFLAGS)"; \ echo " CFLAGS: $(CONFIG_LIB_NI845X_CFLAGS)"; \

18
Makefile.include
View File

@ -104,21 +104,3 @@ int main(int argc, char **argv)
} }
endef endef
export LIBUSB1_TEST export LIBUSB1_TEST
define LIBJAYLINK_TEST
#include <stddef.h>
#include <libjaylink/libjaylink.h>
int main(int argc, char **argv)
{
struct jaylink_context *ctx;
(void)argc;
(void)argv;
jaylink_init(&ctx);
jaylink_exit(ctx);
return 0;
}
endef
export LIBJAYLINK_TEST