KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

toolchain: Replace YASM with NASM

Browse source 
Packages libx264 and ffmpeg are built with ASM options on x86 platforms.
The current libx264 version no longer builds with YASM and requires NASM.
ffmpeg 3.x can be built with either YASM or NASM however, furture 4.x versions
will require NASM.

Signed-off-by: Ted Hess <thess@kitschensync.net>
Acked-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Ted Hess 2018-06-28 19:28:02 -04:00
parent 9009efa18b
commit 0f543883cd
3 changed files with 13 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
toolchain/Config.in
View file

@ -224,13 +224,13 @@ comment "Compiler"
source "toolchain/gcc/Config.in" source "toolchain/gcc/Config.in"
config YASM config NASM
bool bool
depends on ( i386 || x86_64 ) depends on ( i386 || x86_64 )
prompt "Build yasm" if TOOLCHAINOPTS prompt "Build nasm" if TOOLCHAINOPTS
default y default y
help help
Enable if you want to build yasm Enable if you want to build nasm
comment "C Library" comment "C Library"
depends on TOOLCHAINOPTS depends on TOOLCHAINOPTS

2
toolchain/Makefile
View file

@ -29,7 +29,7 @@
curdir:=toolchain curdir:=toolchain
# subdirectories to descend into # subdirectories to descend into
$(curdir)/builddirs := $(if $(CONFIG_GDB),gdb) $(if $(CONFIG_EXTERNAL_TOOLCHAIN),wrapper,kernel-headers binutils gcc/initial gcc/final $(LIBC) fortify-headers) $(if $(CONFIG_YASM),yasm) $(curdir)/builddirs := $(if $(CONFIG_GDB),gdb) $(if $(CONFIG_EXTERNAL_TOOLCHAIN),wrapper,kernel-headers binutils gcc/initial gcc/final $(LIBC) fortify-headers) $(if $(CONFIG_NASM),nasm)
ifdef CONFIG_USE_UCLIBC ifdef CONFIG_USE_UCLIBC
$(curdir)/builddirs += $(LIBC)/utils $(curdir)/builddirs += $(LIBC)/utils
endif endif

25
toolchain/yasm/Makefile → toolchain/nasm/Makefile
View file

@ -1,34 +1,26 @@
# #
# Copyright (C) 2016 Daniel Golle <daniel@makrotopia.org>
#
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
# #
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=yasm PKG_NAME:=nasm
PKG_VERSION:=1.3.0 PKG_VERSION:=2.13.03
PKG_SOURCE_URL:=http://www.tortall.net/projects/yasm/releases/ PKG_SOURCE_URL:=https://www.nasm.us/pub/nasm/releasebuilds/$(PKG_VERSION)/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_HASH:=3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f PKG_HASH:=812ecfb0dcbc5bd409aaa8f61c7de94c5b8752a7b00c632883d15b2ed6452573
HOST_BUILD_PARALLEL:=1 HOST_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/toolchain-build.mk include $(INCLUDE_DIR)/toolchain-build.mk
YASM_CONFIGURE:= \ HOST_CONFIGURE_ARGS+= \
./configure \
--prefix=$(TOOLCHAIN_DIR) \
--build=$(GNU_HOST_NAME) \
--host=$(GNU_HOST_NAME) \
--target=$(REAL_GNU_TARGET_NAME) \ --target=$(REAL_GNU_TARGET_NAME) \
--with-sysroot=$(TOOLCHAIN_DIR) \ --with-sysroot=$(TOOLCHAIN_DIR) \
--disable-multilib \ --enable-lto \
--disable-werror \ --disable-werror \
--disable-nls \
--disable-sim \
--disable-gdb \ --disable-gdb \
$(SOFT_FLOAT_CONFIG_OPTION) \ $(SOFT_FLOAT_CONFIG_OPTION) \
@ -40,8 +32,9 @@ endef
define Host/Configure define Host/Configure
(cd $(HOST_BUILD_DIR); \ (cd $(HOST_BUILD_DIR); \
$(YASM_CONFIGURE) \ ./autogen.sh \
); );
$(call Host/Configure/Default)
endef endef
define Host/Compile define Host/Compile