From e56901c040301d40d63a965eac8dcc029a4d0874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ciro=20Santilli=20=E5=85=AD=E5=9B=9B=E4=BA=8B=E4=BB=B6=20?= =?UTF-8?q?=E6=B3=95=E8=BD=AE=E5=8A=9F?= Date: Fri, 28 Sep 2018 00:00:00 +0000 Subject: [PATCH] configure: docbook2x for future ctng --- configure | 55 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/configure b/configure index e6b7fd5..def95d8 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -eu +set -eux all=false apt_get=true baremetal=false @@ -76,31 +76,36 @@ fi if "$apt_get"; then pkgs="\ - automake \ - bc \ - build-essential \ - coreutils \ - cpio \ - expect \ - git \ - moreutils \ - rsync \ - tmux \ - unzip \ - vinagre \ - wget \ - " +automake \ +bc \ +build-essential \ +coreutils \ +cpio \ +expect \ +git \ +moreutils \ +rsync \ +tmux \ +unzip \ +vinagre \ +wget \ +" if "$gem5"; then - pkgs="$pkgs \ - ccache \ - gcc-aarch64-linux-gnu \ - gcc-arm-linux-gnueabi \ - libgoogle-perftools-dev \ - protobuf-compiler \ - python-dev \ - python-pip \ - scons \ - " + pkgs="${pkgs} \ +ccache \ +gcc-aarch64-linux-gnu \ +gcc-arm-linux-gnueabi \ +libgoogle-perftools-dev \ +protobuf-compiler \ +python-dev \ +python-pip \ +scons \ +" + fi + if "$baremetal"; then + pkgs="${pkgs} \ +docbook2x \ +" fi command -v apt-get >/dev/null 2>&1 || { cat <