From 836421ff2082d16f04f2ef08af38ec4f8e2c62f3 Mon Sep 17 00:00:00 2001 From: Lucio Andrés Illanes Albornoz (arab, vxp) Date: Jun 22 2016 18:04:09 +0000 Subject: Pass correct ar(1) and ranlib(1) for apk-tools v2.6.6 and libfetch v2.3.3. --- diff --git a/build.vars b/build.vars index 4f4c691..3fe6f9a 100644 --- a/build.vars +++ b/build.vars @@ -77,6 +77,8 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}"; : ${PKG_APK_TOOLS_VERSION:=2.6.6}; : ${PKG_APK_TOOLS_SHA256SUM:=7e5e86c856ce236c7fd54605ee0b1dbf59920398d3b33f9f6ff0e5f98e6828af}; : ${PKG_APK_TOOLS_URL:=http://git.alpinelinux.org/cgit/apk-tools/snapshot/apk-tools-${PKG_APK_TOOLS_VERSION}.tar.bz2}; +: ${PKG_APK_TOOLS_AR_BUILD:=${HOST_NATIVE}-ar}; +: ${PKG_APK_TOOLS_AR_INSTALL:=${HOST_NATIVE}-ar}; : ${PKG_APK_TOOLS_MAKEFLAGS_INSTALL_EXTRA:=MANDIR=/share/man DOCDIR=/share/doc/apk}; : ${PKG_APK_TOOLS_BUILD_DIR:=apk-tools-${PKG_APK_TOOLS_VERSION}}; : ${PKG_APK_TOOLS_ENV_VARS_EXTRA:=CFLAGS=--sysroot=${PREFIX_LVL3}:CROSS_COMPILE=${HOST_NATIVE}-:LUAAPK=:PKG_CONFIG_PATH=${PREFIX_LVL3}/lib/pkgconfig:VERBOSE=1:PREFIX=${PREFIX_LVL3}:LDFLAGS_LIBS=--sysroot=${PREFIX_LVL3} -lcrypto -lssl -lz}; @@ -209,11 +211,13 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}"; : ${PKG_LIBFETCH_VERSION:=2.33}; : ${PKG_LIBFETCH_SHA256SUM:=3226f53d5ad29cc27510db968ef0d37bf4554b8aaaeadcd56e23067213b08943}; : ${PKG_LIBFETCH_URL:=https://sources.archlinux.org/other/libfetch/libfetch-${PKG_LIBFETCH_VERSION}.tar.gz}; +: ${PKG_LIBFETCH_AR_BUILD:=${HOST_NATIVE}-ar}; : ${PKG_LIBFETCH_BUILD_DIR:=libfetch-${PKG_LIBFETCH_VERSION}}; : ${PKG_LIBFETCH_ENV_VARS_EXTRA:=CFLAGS=--sysroot=${PREFIX_LVL3}:LDFLAGS=--sysroot=${PREFIX_LVL3}}; : ${PKG_LIBFETCH_LIBFILES_FIX:=1}; : ${PKG_LIBFETCH_MAKEFLAGS_BUILD_EXTRA:=E=echo Q= AR=${TARGET}-ar CC=${TARGET}-gcc LD=${TARGET}-gcc}; : ${PKG_LIBFETCH_MAKEFLAGS_INSTALL_EXTRA:=E=echo Q= prefix=}; +: ${PKG_LIBFETCH_RANLIB_INSTALL:=${HOST_NATIVE}-ranlib}; : ${PKG_LIBFFI_VERSION:=3.2.1}; : ${PKG_LIBFFI_SHA256SUM:=d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37}; : ${PKG_LIBFFI_URL=ftp://sourceware.org/pub/libffi/libffi-${PKG_LIBFFI_VERSION}.tar.gz};