summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2017-04-19 14:09:07 +0200
committerDamjan Marion <dmarion.lists@gmail.com>2017-04-20 11:30:28 +0000
commit686c1c8454803e48d45428a720f129f24dc981f7 (patch)
treea5a7b959c029467afb949ccb252b5310921fecf4
parentf1ff5ff1049fd2750823273a3a92779e5fd6e1a5 (diff)
Extend ebuild to specify "configure" subdir, enable verify for sample-plugin
Change-Id: I2056e5d19bc3713e7a13e015dabf3b2431800973 Signed-off-by: Damjan Marion <damarion@cisco.com>
-rw-r--r--Makefile2
-rw-r--r--build-data/packages/sample-plugin.mk5
-rw-r--r--build-root/Makefile6
-rw-r--r--src/examples/sample-plugin/sample/sample_test.c2
4 files changed, 11 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 44ae20e405d..f9a90d49084 100644
--- a/Makefile
+++ b/Makefile
@@ -423,6 +423,8 @@ ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)
$(call banner,"Building for PLATFORM=vpp using clang")
@make -C build-root CC=clang PLATFORM=vpp TAG=vpp_clang wipe-all install-packages
endif
+ $(call banner,"Building sample-plugin")
+ @make -C build-root PLATFORM=vpp TAG=vpp sample-plugin-install
$(call banner,"Building $(PKG) packages")
@make pkg-$(PKG)
@make test
diff --git a/build-data/packages/sample-plugin.mk b/build-data/packages/sample-plugin.mk
new file mode 100644
index 00000000000..fd1ee3210f5
--- /dev/null
+++ b/build-data/packages/sample-plugin.mk
@@ -0,0 +1,5 @@
+sample-plugin_source = src
+sample-plugin_configure_subdir = examples/sample-plugin
+sample-plugin_configure_depend = vpp-install
+sample-plugin_CPPFLAGS = $(call installed_includes_fn, vpp)
+sample-plugin_LDFLAGS = $(call installed_libs_fn, vpp)
diff --git a/build-root/Makefile b/build-root/Makefile
index 8b83990e22f..f2f77804ad4 100644
--- a/build-root/Makefile
+++ b/build-root/Makefile
@@ -579,7 +579,7 @@ image_extra_dependencies = $($(PLATFORM)_image_extra_dependencies)
### dbarach
configure_package_gnu = \
- s=$(call find_source_fn,$(PACKAGE_SOURCE)) ; \
+ s=$(call find_source_fn,$(PACKAGE_SOURCE))$(PACKAGE_SUBDIR) ; \
if [ ! -f $$s/configure ] ; then \
autoreconf -i -f $$s ; \
fi ; \
@@ -635,7 +635,8 @@ configure_check_timestamp = \
mkdir -p $(PACKAGE_INSTALL_DIR) ; \
conf="$(TIMESTAMP_DIR)/$(CONFIGURE_TIMESTAMP)" ; \
dirs="$(call package_mk_fn,$(PACKAGE)) \
- $(wildcard $(call find_source_fn,$(PACKAGE_SOURCE))/configure) \
+ $(wildcard $(call find_source_fn, \
+ $(PACKAGE_SOURCE))$(PACKAGE_SUBDIR)/configure) \
$(MU_BUILD_ROOT_DIR)/config.site" ; \
if [[ $(call find_newer_fn, $${conf}, $${dirs}, $?) ]]; then \
$(configure_package) ; \
@@ -747,6 +748,7 @@ GIT = git
# Multiple packages may use a single source tree.
# For example, gcc-bootstrap package shares gcc source.
PACKAGE_SOURCE = $(if $($(PACKAGE)_source),$($(PACKAGE)_source),$(PACKAGE))
+PACKAGE_SUBDIR = $(if $($(PACKAGE)_configure_subdir),/$($(PACKAGE)_configure_subdir),)
# Use git to download source if directory is not found
find_source_for_package = \
diff --git a/src/examples/sample-plugin/sample/sample_test.c b/src/examples/sample-plugin/sample/sample_test.c
index b3e71c760ac..2298675be74 100644
--- a/src/examples/sample-plugin/sample/sample_test.c
+++ b/src/examples/sample-plugin/sample/sample_test.c
@@ -92,9 +92,7 @@ _(SAMPLE_MACSWAP_ENABLE_DISABLE_REPLY, sample_macswap_enable_disable_reply)
static int api_sample_macswap_enable_disable (vat_main_t * vam)
{
- sample_test_main_t * sm = &sample_test_main;
unformat_input_t * i = vam->input;
- f64 timeout;
int enable_disable = 1;
u32 sw_if_index = ~0;
vl_api_sample_macswap_enable_disable_t * mp;