X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=configure;h=29f7dbd32581b660347095551d2c25f0d7948970;hb=d810a6e218e9af3c3bccd58c9a2d925a7f12242e;hp=2c3f499039525a4daf54c087e71daf31a695b1bb;hpb=c8983241b9d93d2c3b60b0705efbc3cdee54c534;p=vpp.git

diff --git a/configure b/configure
index 2c3f4990395..29f7dbd3258 100755
--- a/configure
+++ b/configure
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -o pipefail -o errtrace -o nounset -o errexit
 
 # Experimental script, please consult with dmarion@me.com before
 # submitting any changes
@@ -7,7 +8,12 @@
 build_dir=.
 install_dir=/usr/local
 build_type=release
-prefix_path=/opt/vpp/external/$(uname -m)/
+src_dir="$(dirname "$(readlink -f "$0")")"
+host_arch=$(uname -m)
+arch=${host_arch}
+native_only=no
+wipe=no
+args=()
 
 help()
 {
@@ -18,9 +24,11 @@ USAGE: ${0} [options]
 
 OPTIONS:
   --help, -h              This help
+  --arch, -a              Cross-compile for specified target architecture (aarch64, riscv64, i386, ...)
   --build-dir, -b         Build directory
   --install-dir, -i       Install directory
-  --type, -t              Build type (release, debug, ... )
+  --build-type, -t        Build type (release, debug, ...)
+  --native-only, -n       Only compile for Native CPU (no multiarch)
   --wipe, -w              Wipe whole repo (except startup.* files)
 __EOF__
 }
@@ -40,6 +48,15 @@ while (( "$#" )); do
         exit 1
       fi
       ;;
+    -a|--arch)
+      if [ -n "$2" ] && [ ${2:0:1} != "-" ]; then
+	arch=$2
+        shift 2
+      else
+        echo "Error: Argument for $1 is missing" >&2
+        exit 1
+      fi
+      ;;
     -i|--install-dir)
       if [ -n "$2" ] && [ ${2:0:1} != "-" ]; then
         install_dir=$2
@@ -58,9 +75,13 @@ while (( "$#" )); do
         exit 1
       fi
       ;;
+    -n|--native-only)
+      native_only=yes
+      shift 1
+      ;;
     -w|--wipe)
-      git clean -fdx --exclude=startup.\*
-      exit 1
+      wipe=yes
+      shift 1
       ;;
     -*|--*=) # unsupported flags
       echo "Error: Unsupported flag $1" >&2
@@ -73,24 +94,39 @@ while (( "$#" )); do
   esac
 done
 
-cmake \
-  -G Ninja \
-  -S src \
-  -B ${build_dir} \
-  -DCMAKE_PREFIX_PATH=${prefix_path} \
-  -DCMAKE_INSTALL_PREFIX=${install_dir} \
-  -DCMAKE_BUILD_TYPE:STRING=${build_type}
+if [ "${arch}" != "${host_arch}" ] ; then
+  args+=("-DCMAKE_SYSTEM_NAME=Linux")
+  args+=("-DCMAKE_SYSTEM_PROCESSOR=${arch}")
+  args+=("-DCMAKE_C_COMPILER=clang")
+  args+=("-DCMAKE_C_COMPILER_TARGET=${arch}-linux-gnu")
+  args+=("-DCMAKE_ASM_COMPILER_TARGET=${arch}-linux-gnu")
+  args+=("-DCMAKE_FIND_ROOT_PATH=/usr/${arch}-linux-gnu")
+  args+=("-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER")
+  args+=("-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=BOTH")
+  args+=("-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=BOTH")
+  args+=("-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ONLY")
+fi
 
-  cat << __EOF__
+args+=("-DCMAKE_PREFIX_PATH=/opt/vpp/external/${arch}")
+args+=("-DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=ON")
+args+=("-DCMAKE_INSTALL_PREFIX=${install_dir}")
+args+=("-DCMAKE_BUILD_TYPE:STRING=${build_type}")
+[ "${native_only}" == "yes" ] && args+=("-DVPP_BUILD_NATIVE_ONLY:BOOL=ON")
+
+[ "${wipe}" == "yes" ] && git clean -fdx --exclude=startup.\*
+
+cmake ${args[@]} -G Ninja -S ${src_dir}/src -B ${build_dir}
+
+cat << __EOF__
 
   Useful build commands:
 
-  ninja             Build VPP
-  ninja config      Start build configuration TUI
-  ninja compdb      Generate compile_commands.json
-  ninja run         Runs VPP using startup.conf in the build directory
-  ninja debug       Runs VPP inside GDB using startup.conf in the build directory
-  ninja pkg-deb     Create .deb packages
-  ninja install     Install VPP to $install_dir
+  ninja                   Build VPP
+  ninja set-build-type-*  Change build type to <debug|release|gcov|...>
+  ninja config            Start build configuration TUI
+  ninja run               Runs VPP using startup.conf in the build directory
+  ninja debug             Runs VPP inside GDB using startup.conf in the build directory
+  ninja pkg-deb           Create .deb packages
+  ninja install           Install VPP to $install_dir
 
 __EOF__