*** suricata-suricata-5.0.0-vanilla/configure.ac	2019-10-13 11:29:15.000000000 +0300
--- suricata-suricata-5.0.0/configure.ac	2019-11-25 16:16:21.853878166 +0200
***************
*** 2338,2343 ****
--- 2338,2344 ----
      AM_CONDITIONAL([HAVE_PDFLATEX], [test "x$enable_pdflatex" != "xno"])
  
  # Cargo/Rust
+     AM_CONDITIONAL([RUST_CROSS_COMPILE],[test "x$cross_compiling" = "xyes"])
      AC_PATH_PROG(RUSTC, rustc, "no")
      if test "$RUSTC" = "no"; then
          echo ""
***************
*** 2394,2403 ****
          echo
          exit 1
      fi
      if test "x$enable_debug" = "xyes"; then
!       RUST_SURICATA_LIB="../rust/target/debug/${RUST_SURICATA_LIBNAME}"
      else
!       RUST_SURICATA_LIB="../rust/target/release/${RUST_SURICATA_LIBNAME}"
      fi
  
      RUST_LDADD="${RUST_SURICATA_LIB} ${RUST_LDADD}"
--- 2395,2411 ----
          echo
          exit 1
      fi
+ 
+     if test "x$cross_compiling" = "xyes"; then
+       RUST_SURICATA_LIB_XC_DIR="${host_alias}/"
+     else
+       RUST_SURICATA_LIB_XC_DIR=
+     fi
+ 
      if test "x$enable_debug" = "xyes"; then
!       RUST_SURICATA_LIB="../rust/target/${RUST_SURICATA_LIB_XC_DIR}debug/${RUST_SURICATA_LIBNAME}"
      else
!       RUST_SURICATA_LIB="../rust/target/${RUST_SURICATA_LIB_XC_DIR}release/${RUST_SURICATA_LIBNAME}"
      fi
  
      RUST_LDADD="${RUST_SURICATA_LIB} ${RUST_LDADD}"
***************
*** 2429,2435 ****
      AC_SUBST([RUSTUP_HOME_PATH], [$rustup_home_path])
      AC_SUBST([rustup_home])
  
!     AC_CHECK_FILES([$srcdir/rust/vendor], [have_rust_vendor="yes"])
      if test "x$have_rust_vendor" = "xyes"; then
        rust_vendor_comment=""
      fi
--- 2437,2448 ----
      AC_SUBST([RUSTUP_HOME_PATH], [$rustup_home_path])
      AC_SUBST([rustup_home])
  
!     if test "x$cross_compiling" != "xyes"; then
!       AC_CHECK_FILES([$srcdir/rust/vendor], [have_rust_vendor="yes"])
!     else
!       AS_IF([test -d "$srcdir/rust/vendor"], have_rust_vendor="yes", [])
!     fi
! 
      if test "x$have_rust_vendor" = "xyes"; then
        rust_vendor_comment=""
      fi
*** suricata-suricata-5.0.0-vanilla/rust/Makefile.am	2019-10-13 11:29:15.000000000 +0300
--- suricata-suricata-5.0.0/rust/Makefile.am	2019-11-25 15:34:16.888025982 +0200
***************
*** 23,28 ****
--- 23,32 ----
  RUST_FEATURES +=	debug
  endif
  
+ if RUST_CROSS_COMPILE 
+ RUST_TARGET = --target $(host_triplet)
+ endif
+ 
  all-local:
  if HAVE_PYTHON
  	cd $(top_srcdir)/rust && $(HAVE_PYTHON) ./gen-c-headers.py
***************
*** 33,45 ****
  		CARGO_HOME="$(CARGO_HOME)" \
  		CARGO_TARGET_DIR="$$rustpath/rust/target" \
  		$(CARGO) build $(RELEASE) $(FROZEN) \
! 			--features "$(RUST_FEATURES)"
  else
  	cd $(top_srcdir)/rust && @rustup_home@ \
  		CARGO_HOME="$(CARGO_HOME)" \
  		CARGO_TARGET_DIR="$(abs_top_builddir)/rust/target" \
  		$(CARGO) build $(RELEASE) $(FROZEN) \
! 			--features "$(RUST_FEATURES)"
  endif
  
  clean-local:
--- 37,49 ----
  		CARGO_HOME="$(CARGO_HOME)" \
  		CARGO_TARGET_DIR="$$rustpath/rust/target" \
  		$(CARGO) build $(RELEASE) $(FROZEN) \
! 			--features "$(RUST_FEATURES)" $(RUST_TARGET)
  else
  	cd $(top_srcdir)/rust && @rustup_home@ \
  		CARGO_HOME="$(CARGO_HOME)" \
  		CARGO_TARGET_DIR="$(abs_top_builddir)/rust/target" \
  		$(CARGO) build $(RELEASE) $(FROZEN) \
! 			--features "$(RUST_FEATURES)" $(RUST_TARGET)
  endif
  
  clean-local: