- trying more

diff --git a/gnome-tour-x32.patch b/gnome-tour-x32.patch
index 0d37cbb6be68aedea0f1c68bb18afb761555f883..75d016254f72d4ef8258ec901b8b90bf31844187 100644 (file)
--- a/gnome-tour-x32.patch
+++ b/gnome-tour-x32.patch
@@ -4,9 +4,8 @@
  
  export MESON_BUILD_ROOT="$1"
  export MESON_SOURCE_ROOT="$2"
  
  export MESON_BUILD_ROOT="$1"
  export MESON_SOURCE_ROOT="$2"

--export CARGO_TARGET_DIR="$MESON_BUILD_ROOT"/target

 +export CARGO_TARGET_OPT="--target x86_64-unknown-linux-gnux32"
 +export CARGO_TARGET_OPT="--target x86_64-unknown-linux-gnux32"

-+export CARGO_TARGET_DIR="$MESON_BUILD_ROOT"/target/x86_64-unknown-linux-gnux32
+ export CARGO_TARGET_DIR="$MESON_BUILD_ROOT"/target

  export CARGO_HOME="$CARGO_TARGET_DIR"/cargo-home
  FEATURES="$6"
  
  export CARGO_HOME="$CARGO_TARGET_DIR"/cargo-home
  FEATURES="$6"
  


@@ -17,11 +16,13 @@
 -    cargo build --manifest-path \
 +    cargo build $CARGO_TARGET_OPT --manifest-path \
          "$MESON_SOURCE_ROOT"/Cargo.toml $FEATURES && \
 -    cargo build --manifest-path \
 +    cargo build $CARGO_TARGET_OPT --manifest-path \
          "$MESON_SOURCE_ROOT"/Cargo.toml $FEATURES && \

-         cp "$CARGO_TARGET_DIR"/debug/$5 $3
+-        cp "$CARGO_TARGET_DIR"/debug/$5 $3
++        cp "$CARGO_TARGET_DIR"/debug/x86_64-unknown-linux-gnux32/$5 $3

  else
      echo "RELEASE MODE"
 -    cargo build --manifest-path \
 +    cargo build $CARGO_TARGET_OPT --manifest-path \
          "$MESON_SOURCE_ROOT"/Cargo.toml $FEATURES --release && \
  else
      echo "RELEASE MODE"
 -    cargo build --manifest-path \
 +    cargo build $CARGO_TARGET_OPT --manifest-path \
          "$MESON_SOURCE_ROOT"/Cargo.toml $FEATURES --release && \

-         cp "$CARGO_TARGET_DIR"/release/$5 $3
+-        cp "$CARGO_TARGET_DIR"/release/$5 $3
++        cp "$CARGO_TARGET_DIR"/release/x86_64-unknown-linux-gnux32/$5 $3

  fi
  fi