From 1608400b63b192f1c87fa735e0aa9e6447542713 Mon Sep 17 00:00:00 2001 From: Lucio Andrés Illanes Albornoz Date: Jan 16 2019 01:34:15 +0000 Subject: vars/build.vars:host_toolchain: adds nasm v2.14.02. vars/nasm_host.vars: force target prefixes in filenames. --- diff --git a/vars/build.vars b/vars/build.vars index 26e8437..85e73b9 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -119,7 +119,7 @@ HOST_TOOLCHAIN_BUILD_TYPE="host"; HOST_TOOLCHAIN_CONFIGURE_ARGS="--disable-nls --host=${DEFAULT_TARGET} --prefix= --target=${DEFAULT_TARGET}"; HOST_TOOLCHAIN_PACKAGES=" binutils_host gcc_stage1_host psxstub_host musl_no_complex_host gcc_runtime_host -musl_full_host gcc_libstdcpp_v3_host gcc_full_host ldso_host"; +musl_full_host gcc_libstdcpp_v3_host gcc_full_host ldso_host nasm_host"; HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}"; : ${PKG_BINUTILS_HOST_SHA256SUM:=250d3b2925c6b211fb16173b0b25bc091c58829fbcad3eb849645e0af52cf7fa}; : ${PKG_BINUTILS_HOST_VERSION:=2.24.51}; @@ -184,6 +184,10 @@ HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}"; : ${PKG_LDSO_HOST_INSTALL_FILES:="@../${DEFAULT_TARGET}/lib/libldso.a=${PREFIX}/lib/libldso.a"}; : ${PKG_LDSO_HOST_MAKEFLAGS_BUILD_EXTRA:=STATIC_LIB_NAME=libldso.a}; : ${PKG_LDSO_HOST_MAKEFLAGS_INSTALL_EXTRA:=STATIC_LIB_NAME=libldso.a}; +: ${PKG_NASM_HOST_SHA256SUM:=34fd26c70a277a9fdd54cb5ecf389badedaf48047b269d1008fbc819b24e80bc}; +: ${PKG_NASM_HOST_VERSION:=2.14.02}; +: ${PKG_NASM_HOST_URL:=https://www.nasm.us/pub/nasm/releasebuilds/${PKG_NASM_HOST_VERSION}/nasm-${PKG_NASM_HOST_VERSION}.tar.bz2}; +: ${PKG_NASM_HOST_PREFIX:=${PREFIX}}; # # Build target host_toolchain_mingw32 diff --git a/vars/nasm_host.vars b/vars/nasm_host.vars new file mode 100644 index 0000000..4cdcdf9 --- /dev/null +++ b/vars/nasm_host.vars @@ -0,0 +1,13 @@ +# +# set -o errexit -o noglob are assumed. +# + +pkg_nasm_host_install_make_post() { + local _fname=""; + for _fname in bin/nasm bin/ndisasm share/man/man1/nasm.1 share/man/man1/ndisasm.1; do + ex_rtl_fileop mv "${PKG_DESTDIR}/${_fname}" \ + "${PKG_DESTDIR}/${_fname%/*}/${PKG_TARGET}-${_fname##*/}"; + done; +}; + +# vim:filetype=sh