laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15722 )
Change subject: contrib/jenkins.sh: Also build host/gadget code ...................................................................... contrib/jenkins.sh: Also build host/gadget code Change-Id: Ided54d69a776ce2b86f4117a27fc7ad3b7a1a1d2 --- M ccid_host/Makefile M contrib/jenkins.sh 2 files changed, 19 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/ccid_host/Makefile b/ccid_host/Makefile index 53ee932..c8862a2 100644 --- a/ccid_host/Makefile +++ b/ccid_host/Makefile @@ -1,13 +1,14 @@ -CFLAGS=-Wall -g -I../ccid_common -I. +CFLAGS=-Wall -g $(shell pkg-config --cflags libosmocore) -I../ccid_common -I. +LIBS?=-lasan $(shell pkg-config --libs libosmocore) ccid_functionfs: ccid_main_functionfs.o \ ccid_slot_sim.o \ ../ccid_common/ccid_proto.o \ ../ccid_common/ccid_device.o - $(CC) $(CFLAGS) -o $@ $^ -lasan -losmocore -ltalloc -laio + $(CC) $(CFLAGS) -o $@ $^ $(LIBS) -laio hub_functionfs: hub_main_functionfs.o - $(CC) $(CFLAGS) -o $@ $^ -lasan -losmocore -ltalloc -laio + $(CC) $(CFLAGS) -o $@ $^ $(LIBS) -laio %.o: %.c $(CC) $(CFLAGS) -o $@ -c $^ diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 19bc222..fb324cc 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -13,6 +13,21 @@ inst="$TOPDIR/install" export deps inst + +echo +echo "=============== libosmocore hostt build ===========" +osmo-build-dep.sh libosmocore "" --disable-doxygen +export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" +export LD_LIBRARY_PATH="$inst/lib" +export PATH="$inst/bin:$PATH" + +echo +echo "=============== CCID usb_gadget build ===========" +cd $TOPDIR/ccid_host +make clean +make $PARALLEL_MAKE +make clean + # adapted from echo echo "=============== libosmocore cross-build ===========" -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15722 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ided54d69a776ce2b86f4117a27fc7ad3b7a1a1d2 Gerrit-Change-Number: 15722 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <lafo...@osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <lafo...@osmocom.org> Gerrit-MessageType: merged