diff options
| author | Andrew Clemons <andrew.clemons@gmail.com> | 2017-10-14 12:08:31 +0100 |
|---|---|---|
| committer | David Spencer <idlemoor@slackbuilds.org> | 2017-10-14 14:47:00 +0100 |
| commit | 1ab50bb44ad66c12be1ed485ad5dfa68b2311291 (patch) | |
| tree | 91c6510cdda16c6520bcddc0f1bc92487ca485b9 /development | |
| parent | 55d8113a763370a75a320d8bb5600a9aa6c3904f (diff) | |
| download | slackbuilds-1ab50bb44ad66c12be1ed485ad5dfa68b2311291.tar.gz | |
development/cargo-vendor: Fix build on i?86.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
Diffstat (limited to 'development')
| -rw-r--r-- | development/cargo-vendor/cargo-vendor.SlackBuild | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/development/cargo-vendor/cargo-vendor.SlackBuild b/development/cargo-vendor/cargo-vendor.SlackBuild index 5ced9ecb37..a31e0399a0 100644 --- a/development/cargo-vendor/cargo-vendor.SlackBuild +++ b/development/cargo-vendor/cargo-vendor.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=cargo-vendor VERSION=${VERSION:-0.1.12} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -213,6 +213,17 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +if case "$ARCH" in i?86) true ;; *) false ;; esac ; then + # error: failed to run custom build command for `openssl-sys v0.9.17` + # process didn't exit successfully: `/tmp/SBo/cargo-vendor-0.1.12/target/release/build/openssl-sys-1001b6424b340fb9/build-script-build` (exit code: 101) + # --- stdout + # cargo:rerun-if-env-changed=OPENSSL_LIB_DIR + # cargo:rerun-if-env-changed=OPENSSL_INCLUDE_DIR + # cargo:rerun-if-env-changed=OPENSSL_DIR + # run pkg_config fail: "Cross compilation detected. Use PKG_CONFIG_ALLOW_CROSS=1 to override" + export PKG_CONFIG_ALLOW_CROSS=1 +fi + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ cargo build --release $CARGOTARGET |