needs rebase, I think:
erachmi@erachmi-ericsson:~/linaro/ODP/odp$ git am
~/incoming/lng-odp_API-NEXT_PATCH_*
Applying: merge fix: platform/linux-generic/Makefile.am
error: patch failed: platform/linux-generic/Makefile.am:20
error: platform/linux-generic/Makefile.am: patch does not apply
Patch failed at 0001 merge fix: platform/linux-generic/Makefile.am
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Tried both with patch 15 alone and the hole series...
sorry...
Christophe.
On 27 January 2017 at 15:29, Maxim Uvarov <maxim.uva...@linaro.org> wrote:
> Travis CI uses old libconfig8 amd64 1.3.2-2ubuntu2,
> which does not have defines for errors. Move error print
> under ifdef to fix compilation.
>
> Signed-off-by: Maxim Uvarov <maxim.uva...@linaro.org>
> ---
> platform/linux-generic/odp_init.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/platform/linux-generic/odp_init.c
> b/platform/linux-generic/odp_init.c
> index 2cd8fe3f..685e02fa 100644
> --- a/platform/linux-generic/odp_init.c
> +++ b/platform/linux-generic/odp_init.c
> @@ -130,12 +130,17 @@ static int read_configfile(void)
> if (config_filename) {
> ODP_DBG("Reading configuration file: %s\n", config_filename);
> if (!config_read_file(cf, config_filename)) {
> +#if defined(LIBCONFIG_VER_MAJOR) && LIBCONFIG_VER_MAJOR >= 1 && \
> + LIBCONFIG_VER_MINOR >= 4
> ODP_ERR("%s:%d - %s\n",
> config_error_file(cf),
> config_error_line(cf),
> config_error_text(cf));
> +#else
> + ODP_ERR("config_read_file\n");
> +#endif
> config_destroy(cf);
> - return(-1);
> + return -1;
> }
> }
>
> --
> 2.11.0.295.gd7dffce
>
