Hello Jenkins Builder, I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/6618 to look at the new patch set (#5). Depend on libosmocore Change-Id: If345c89293fcd7d1ad4f17214eea339951f25a5d --- M Transceiver52M/Makefile.am M configure.ac M contrib/jenkins.sh 3 files changed, 27 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/18/6618/5 diff --git a/Transceiver52M/Makefile.am b/Transceiver52M/Makefile.am index f36f4d4..21104dc 100644 --- a/Transceiver52M/Makefile.am +++ b/Transceiver52M/Makefile.am @@ -22,7 +22,7 @@ include $(top_srcdir)/Makefile.common AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/common -AM_CXXFLAGS = -lpthread +AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) SUBDIRS = arm x86 @@ -92,7 +92,8 @@ $(ARCH_LA) \ $(GSM_LA) \ $(COMMON_LA) \ - $(FFTWF_LIBS) + $(FFTWF_LIBS) \ + $(LIBOSMOCORE_LIBS) if USRP1 libtransceiver_la_SOURCES += USRPDevice.cpp diff --git a/configure.ac b/configure.ac index 5c034e5..cba4a0c 100644 --- a/configure.ac +++ b/configure.ac @@ -73,6 +73,8 @@ AC_HEADER_TIME AC_C_BIGENDIAN +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.10.0) + AC_ARG_WITH(usrp1, [ AS_HELP_STRING([--with-usrp1], [enable USRP1 gnuradio based transceiver]) diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 11def5c..5f1eed9 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -15,6 +15,11 @@ mychroot_nocwd -w / "$@" } +base="$PWD" +deps="$base/deps" +inst="$deps/install" +export deps inst + if [ -z "${INSIDE_CHROOT}" ]; then osmo-clean-workspace.sh @@ -49,8 +54,24 @@ fi fi -### BUILD osmo-trx +mkdir "$deps" || true +osmo-build-dep.sh libosmocore "" --disable-doxygen + +verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]") + +export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" +export LD_LIBRARY_PATH="$inst/lib" + +set +x +echo +echo +echo +echo " =============================== osmo-trx ===============================" +echo +set -x + +cd "$base" autoreconf --install --force ./configure $INSTR $MAKE $PARALLEL_MAKE -- To view, visit https://gerrit.osmocom.org/6618 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: If345c89293fcd7d1ad4f17214eea339951f25a5d Gerrit-PatchSet: 5 Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol <pes...@sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy <axilira...@gmail.com>