Skip to content

Commit

Permalink
[debian] increment debian compatibility to 10 to enable parallel pack…
Browse files Browse the repository at this point in the history
…age build (sonic-net#461)

* fix parallel build

Signed-off-by: Stepan Blyschak <stepanb@mellanox.com>

* [debian] increment debian compatibility to 10 to enable parallel package
build

From debhelper man pages:

"If neither option is specified, debhelper currently defaults to
--parallel in compat 10 (or later) and --no-parallel otherwise."

Signed-off-by: Stepan Blyschak <stepanb@mellanox.com>

* make tests run serial

Signed-off-by: Stepan Blyschak <stepanb@mellanox.com>
  • Loading branch information
stepanblyschak authored and lguohan committed Jun 4, 2019
1 parent 5c98f57 commit e10fba8
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 10 deletions.
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR([])
AC_CONFIG_AUX_DIR(config)
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE([subdir-objects foreign])
AM_INIT_AUTOMAKE([subdir-objects foreign serial-tests])
AC_LANG_C
AC_LANG([C++])
AC_PROG_CC
Expand Down
2 changes: 1 addition & 1 deletion debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
18 changes: 11 additions & 7 deletions meta/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -60,30 +60,34 @@ WARN = \
# NOTE: this compilation could be moved to configure.ac

libsaimeta_la_SOURCES = \
../SAI/meta/saimetadata.c \
../SAI/meta/saimetadatautils.c \
../SAI/meta/saiserialize.c
$(top_srcdir)/SAI/meta/saimetadata.c \
$(top_srcdir)/SAI/meta/saimetadatautils.c \
$(top_srcdir)/SAI/meta/saiserialize.c

libsaimeta_la_CFLAGS = $(DBGFLAGS) $(WARN)

../SAI/meta/saimetadata.h ../SAI/meta/saimetadata.c:
make -C ../SAI/meta
$(top_srcdir)/SAI/meta/saimetadata.h $(top_srcdir)/SAI/meta/saimetadata.c: saimeta-gen

saimeta-gen:
make -C $(top_srcdir)/SAI/meta

clean-local:
make -C ../SAI/meta clean
make -C $(top_srcdir)/SAI/meta clean

libsaimetadata_la_SOURCES = \
sai_meta.cpp \
saiattributelist.cpp \
saiserialize.cpp

BUILT_SOURCES = $(top_srcdir)/SAI/meta/saimetadata.h $(top_srcdir)/SAI/meta/saimetadata.c

libsaimetadata_la_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON)
libsaimetadata_la_LIBADD = -lhiredis -lswsscommon libsaimeta.la

bin_PROGRAMS = tests

tests_SOURCES = tests.cpp
tests_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON)
tests_LDADD = -lhiredis -lswsscommon -lpthread -L$(top_dir)/meta/.libs -lsaimetadata -lsaimeta
tests_LDADD = -lhiredis -lswsscommon -lpthread libsaimetadata.la libsaimeta.la

TESTS = tests
2 changes: 1 addition & 1 deletion vslib/src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,6 @@ bin_PROGRAMS = tests

tests_SOURCES = tests.cpp
tests_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON)
tests_LDADD = -lhiredis -lswsscommon -lpthread -L$(top_srcdir)/vslib/src/.libs -lsaivs -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta
tests_LDADD = -lhiredis -lswsscommon -lpthread libsaivs.la $(top_srcdir)/meta/libsaimetadata.la $(top_srcdir)/meta/libsaimeta.la

TESTS = tests

0 comments on commit e10fba8

Please sign in to comment.