From patchwork Sat Jun 24 07:35:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 780338 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wvnD358gXz9s5L for ; Sat, 24 Jun 2017 17:35:31 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2AAB687D98; Sat, 24 Jun 2017 07:35:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id b8m7x-U-QVR9; Sat, 24 Jun 2017 07:35:29 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5989D87C85; Sat, 24 Jun 2017 07:35:29 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id B281B1BFAFE for ; Sat, 24 Jun 2017 07:35:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id AE02C87C49 for ; Sat, 24 Jun 2017 07:35:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HBEZ6dPzmWc0 for ; Sat, 24 Jun 2017 07:35:26 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout09.t-online.de (mailout09.t-online.de [194.25.134.84]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 1B072879EF for ; Sat, 24 Jun 2017 07:35:26 +0000 (UTC) Received: from fwd06.aul.t-online.de (fwd06.aul.t-online.de [172.20.26.150]) by mailout09.t-online.de (Postfix) with SMTP id 8D22C4271D70; Sat, 24 Jun 2017 09:35:23 +0200 (CEST) Received: from fli4l.lan.fli4l (GWwyhYZb8hqfWXKXPFAt9PD0zMj0MoqY3+4Wu2AoMLtQuDMWFgetdzsrViPL35swS7@[79.228.0.48]) by fwd06.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1dOfbC-1BYa800; Sat, 24 Jun 2017 09:35:18 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:52106 helo=kuhls.lan.fli4l) by fli4l.lan.fli4l with esmtp (Exim 4.89) (envelope-from ) id 1dOfbB-00005U-Qt; Sat, 24 Jun 2017 09:35:18 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 24 Jun 2017 09:35:14 +0200 Message-Id: <20170624073514.20975-2-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170624073514.20975-1-bernd.kuhls@t-online.de> References: <20170624073514.20975-1-bernd.kuhls@t-online.de> X-ID: GWwyhYZb8hqfWXKXPFAt9PD0zMj0MoqY3+4Wu2AoMLtQuDMWFgetdzsrViPL35swS7 X-TOI-MSGID: 0216f41a-fdfc-40c3-9c4d-81287350d539 Subject: [Buildroot] [PATCH 2/2] package/x264: needs host-nasm instead of host-yasm X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Upstream switched to nasm >= 2.13 http://git.videolan.org/?p=x264.git;a=commitdiff;h=d2b5f4873e2147452a723b61b14f030b2ee760a5#patch2 Fixes http://autobuild.buildroot.net/results/3f5/3f5759a1fd6aaa0394229cdfce278752d4a01ddc/ Signed-off-by: Bernd Kuhls --- package/x264/x264.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/x264/x264.mk b/package/x264/x264.mk index 69ec4ccea..a5a967b3f 100644 --- a/package/x264/x264.mk +++ b/package/x264/x264.mk @@ -13,9 +13,9 @@ X264_INSTALL_STAGING = YES X264_CONF_OPTS = --disable-avs --disable-lavf --disable-swscale ifeq ($(BR2_i386)$(BR2_x86_64),y) -# yasm needed for assembly files -X264_DEPENDENCIES += host-yasm -X264_CONF_ENV += AS="$(HOST_DIR)/usr/bin/yasm" +# nasm needed for assembly files +X264_DEPENDENCIES += host-nasm +X264_CONF_ENV += AS="$(HOST_DIR)/usr/bin/nasm" else ifeq ($(BR2_ARM_CPU_ARMV7A)$(BR2_aarch64),y) # We need to pass gcc as AS, because the ARM assembly files have to be # preprocessed