diff options
| author | Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org> | 2018-03-23 04:36:41 +0300 |
|---|---|---|
| committer | Maxim Uvarov <maxim.uvarov@linaro.org> | 2018-03-30 18:29:23 +0300 |
| commit | 63123149319eb0e379dc52a3f4691993d026f3bf (patch) | |
| tree | d3ba09c59679b881985ed84ca7eb08eab04e233e /m4 | |
| parent | 9a5a18af733c07109224e328ca0ac640ff49f845 (diff) | |
build: don't use xxd to hexdump config file
Use standard od and sed programs to hexdump config file, removing
dependency on xxd.
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>
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/odp_libconfig.m4 | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/m4/odp_libconfig.m4 b/m4/odp_libconfig.m4 index 632c271ef..c9d770bb5 100644 --- a/m4/odp_libconfig.m4 +++ b/m4/odp_libconfig.m4 @@ -8,12 +8,11 @@ AC_DEFUN([ODP_LIBCONFIG], PKG_CHECK_MODULES([LIBCONFIG], [libconfig]) ########################################################################## -# Check for xxd availability +# Check for od availability ########################################################################## -AC_CHECK_PROGS([XXD], [xxd]) -if test -z "$XXD"; - then AC_MSG_ERROR([Could not find 'xxd']) -fi +AC_CHECK_PROGS([OD], [od]) +AC_PROG_SED +AS_IF([test -z "$OD"], [AC_MSG_ERROR([Could not find 'od'])]) ########################################################################## # Create a header file odp_libconfig_config.h which containins null @@ -21,8 +20,10 @@ fi ########################################################################## AC_CONFIG_COMMANDS([platform/${with_platform}/include/odp_libconfig_config.h], [mkdir -p platform/${with_platform}/include - (cd ${srcdir}/config ; xxd -i odp-${with_platform}.conf) | \ - sed 's/\([[0-9a-f]]\)$/\0, 0x00/' > \ + (echo "static const char config_builtin[[]] = {"; \ + $OD -An -v -tx1 < ${srcdir}/config/odp-${with_platform}.conf | \ + $SED -e 's/[[0-9a-f]]\+/0x\0,/g' ; \ + echo "0x00 };") > \ platform/${with_platform}/include/odp_libconfig_config.h], - [with_platform=$with_platform]) + [with_platform=$with_platform OD=$OD SED=$SED]) ]) # ODP_LIBCONFIG |