This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "".
The branch, master has been updated via fb3f36cec108ce9c55241d9f0e66d4832a552b8a (commit) via 3b31169bee4f036bacbe823c27c9b199fc35fe75 (commit) via 2cb0edd5820fc7fc14d6f4018a605873fdf47033 (commit) from d6e2cd7830bd474e78980414ad7046443a4a3720 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit fb3f36cec108ce9c55241d9f0e66d4832a552b8a Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Fri Sep 8 13:08:36 2017 +0300
configure: call PKG_PROG_PKG_CONFIG explicitly
Since it well might be that first PKG_CHECK_* call ends up under if, it is required (by pkg-config docs) to call PKG_PROG_PKG_CONFIG explicitly.
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/configure.ac b/configure.ac index d4c07a2c..4af2c7c7 100644 --- a/configure.ac +++ b/configure.ac @@ -62,6 +62,8 @@ LT_INIT([]) AC_SUBST([LIBTOOL_DEPS]) AM_PROG_LIBTOOL
+PKG_PROG_PKG_CONFIG + # Checks for library functions. dnl breaks cross-compilation and malloc(0) behaviour is not that important dnl AC_FUNC_MALLOC
commit 3b31169bee4f036bacbe823c27c9b199fc35fe75 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Fri Sep 8 13:05:52 2017 +0300
test: try detecting CUnit location, if it is not found by pkg-config
CUnit 2.1-2 supplied incorrect cunit.pc file, resulting in pkg-config failing to detect library. Try checking CUnit header/library in case of pkg-config failure.
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/test/common_plat/m4/validation.m4 b/test/common_plat/m4/validation.m4 index e303f8f2..78c4ec03 100644 --- a/test/common_plat/m4/validation.m4 +++ b/test/common_plat/m4/validation.m4 @@ -12,7 +12,13 @@ AM_CONDITIONAL([test_vald], [test x$test_vald = xyes ]) ########################################################################## cunit_support=$test_vald AS_IF([test "x$cunit_support" = "xyes"], - [PKG_CHECK_MODULES([CUNIT], [cunit])]) + [PKG_CHECK_MODULES([CUNIT], [cunit], [], + [AC_MSG_WARN([pkg-config could not find CUnit, guessing]) + AC_CHECK_HEADERS([CUnit/Basic.h], [], + [AC_MSG_ERROR(["can't find CUnit headers"])]) + AC_CHECK_LIB([cunit],[CU_get_error], [CUNIT_LIBS="-lcunit"], + [AC_MSG_ERROR([CUnit libraries required])]) +])])
AC_SUBST([CUNIT_CFLAGS]) AC_SUBST([CUNIT_LIBS])
commit 2cb0edd5820fc7fc14d6f4018a605873fdf47033 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Tue Sep 5 14:57:47 2017 +0300
DEPENDENCIES: document changes in CUnit localization
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/DEPENDENCIES b/DEPENDENCIES index a194cad1..e309b339 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -9,12 +9,13 @@ Prerequisites for building the OpenDataPlane (ODP) API automake autoconf libtool + pkg-config
On Debian/Ubuntu systems: - $ sudo apt-get install automake autoconf libtool + $ sudo apt-get install automake autoconf libtool pkg-config
On CentOS/RedHat/Fedora systems: - $ sudo yum install automake autoconf libtool + $ sudo yum install automake autoconf libtool pkgconfig
3. Required libraries
@@ -199,11 +200,11 @@ Prerequisites for building the OpenDataPlane (ODP) API
4.0 Packages needed to build API tests
- Cunit test framework version 2.1-3 is required - Cunit prvodes a framework to run the API test suite that proves conformance to the + CUnit test framework version 2.1-3 is required + CUnit provides a framework to run the API test suite that proves conformance to the ODP API. The home page http://cunit.sourceforge.net/doc/introduction.html
-4.1 Native Cunit install +4.1 Native CUnit install
# Debian/Ubuntu $ apt-get install libcunit1-dev @@ -223,7 +224,7 @@ Prerequisites for building the OpenDataPlane (ODP) API sudo make install
# ... OR ... Install CUnit into user defined location. The same path is - # used in step 4.4 --with-cunit-path=/home/<my_cunit_path> + # used in step 4.4: PKG_CONFIG_PATH=/home/<my_cunit_path>/lib/pkgconfig ./configure --prefix=/home/<my_cunit_path> make make install @@ -232,20 +233,24 @@ Prerequisites for building the OpenDataPlane (ODP) API # reboot, before trying to run e.g. 'make distcheck'. sudo ldconfig
-4.3 Cross compile of Cunit +4.3 Cross compile of CUnit
$ git svn clone http://svn.code.sf.net/p/cunit/code/trunk cunit-code $ cd cunit-code $ ./bootstrap $ ./configure --host=arm-linux-gnueabihf --prefix=/home/${USER}/src/install-cunit
-4.4 Using Cunit with ODP - $ Add the configuration option to the regular configuration options - # Use the default path ... - ./configure --enable-cunit +4.4 Using CUnit with ODP
- # ... OR the user defined path. - ./configure --with-cunit-path=/home/<my_cunit_path> + Configure will automatically look for CUnit if validation testsuite is + enabled. By default it uses pkg-config to locate CUnit. Usually no + additional configuration will be required. Few corner cases: + + # User directory installation + ./configure PKG_CONFIG_PATH=/home/<my_cunit_path>/lib/pkgconfig + + # ... OR directly specifying flags + ./configure CUNIT_CFLAGS="-I/home/<my_cunit_path>/include" CUNIT_LIBS="/home/<my_cunit_path>/lib -lcunit"
5.0 Documentation Images & Doxygen
-----------------------------------------------------------------------
Summary of changes: DEPENDENCIES | 31 ++++++++++++++++++------------- configure.ac | 2 ++ test/common_plat/m4/validation.m4 | 8 +++++++- 3 files changed, 27 insertions(+), 14 deletions(-)
hooks/post-receive