From patchwork Fri Mar 29 15:30:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1069861 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="cOrZffcN"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44W5LG4Fsvz9sPY for ; Sat, 30 Mar 2019 02:31:18 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id ECA962E52E; Fri, 29 Mar 2019 15:31:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HfMUZ0FXw-mg; Fri, 29 Mar 2019 15:31:13 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 001682E99D; Fri, 29 Mar 2019 15:31:12 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 48D2D1BF580 for ; Fri, 29 Mar 2019 15:31:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 3F9ED8324B for ; Fri, 29 Mar 2019 15:31:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YPkbzaqHi097 for ; Fri, 29 Mar 2019 15:31:09 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by whitealder.osuosl.org (Postfix) with ESMTPS id 0F9B28461B for ; Fri, 29 Mar 2019 15:31:09 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id z24so3319033wmi.5 for ; Fri, 29 Mar 2019 08:31:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=2Jx25CCJBIhwX94SJzvhcKu/yAodm5wgU+3bvPBfa24=; b=cOrZffcNBULLboxizpUcWFDc90OQ8zaIS+2urVSxVdO+FYwwLPUHMsf11yw1RxpOeV H4mkdiA5gdRaazE3uSSKqSxtZohTLqYaMSx8T84a+kYzhvaNnPsQqo4GoZBZg7tn8Pa+ WqHj/CqRZhhSEg+4lYQDTmR3OdQEnzTY+tXB4Iq2tretyzaacXcrVOAkJz4mojHAKQnC sTB3hDD3B0ymLPBZPioYfk38JBweIHTSTNiS5oChNMPBRgbdDCTR7wtlrxkVFP/pumcB LZNyhxq12e18Cn2veHZgB6wTInnfxDwr50fUnMJli7lvl1hnNFUSV95FrwsBulXNfs/B 9Z7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=2Jx25CCJBIhwX94SJzvhcKu/yAodm5wgU+3bvPBfa24=; b=arrGR2dQVjCuP1KXlP6VeXyNY4yp4EAUpbgmpHpWs6s/W4ZqBeAeR4i1qkw3NXGe+t x0QPjj8lH6ql1RnlekDLdKIJQGYOHUq5jzHui19l+eISaWuh0BEurk2cd0RsBZoHEY68 DvZpAQwRXaIi631+58kQRKpZyTMzcEX6RuL4TZ261LLwMOle3AjbIDfM3+BKtguVryRQ /cvoZjIIkr2aNS5zkZjcWyYjOj8zlbboAuLFa1OrE/Tkc9sspFgnYzvwWv2a3XcR4Ot0 VZBe9NUeGSovyaH8DIc2Zb+wdhSiWC4yVhWLduSOfBW2t1WalZn5kX80cQXYq4TDVpDq 5KhA== X-Gm-Message-State: APjAAAXtDO7p3538EK5LYx6zGOji9by7pZXaQDqZvZPHsql7Wf9q18+l F/T09PzSJ1Xrldj72/rrPr0XKNfK X-Google-Smtp-Source: APXvYqzm+35MRwdTdS/hSsFMiIZJFAKe6xpb0EhsYOZmR3GFp0fjCnQ7mPfSLcflI3ITwqJfMithpg== X-Received: by 2002:a7b:cb58:: with SMTP id v24mr3807683wmj.121.1553873467221; Fri, 29 Mar 2019 08:31:07 -0700 (PDT) Received: from localhost.localdomain (lfbn-ren-1-314-196.w2-10.abo.wanadoo.fr. [2.10.15.196]) by smtp.gmail.com with ESMTPSA id q2sm4637038wrd.46.2019.03.29.08.31.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Mar 2019 08:31:06 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Fri, 29 Mar 2019 16:30:39 +0100 Message-Id: <20190329153039.21860-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [Buildroot] [PATCH 1/1] package/gst1-libav: fix build on mips64el X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sven Neumann , Fabrice Fontaine MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Apply the same behavior for CPU in gst1-libav than in ffmpeg: - use generic cpu for all mips architectures - use GCC_TARGET_{ARCH,CPU} instead of BR2_TARGET_{ARCH,CPU} Fixes: - http://autobuild.buildroot.org/results/776028a43bd180b4895efc74321e3aee56cbcb47 Signed-off-by: Fabrice Fontaine --- package/gstreamer1/gst1-libav/gst1-libav.mk | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index 254ab719ae..73e47a0639 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -35,10 +35,14 @@ GST1_LIBAV_CONF_EXTRA_OPTS += --disable-bzlib endif # Generic CPU setup for bundled ffmpeg -ifneq ($(call qstrip,$(BR2_GCC_TARGET_CPU)),) -GST1_LIBAV_CONF_EXTRA_OPTS += --cpu=$(BR2_GCC_TARGET_CPU) -else ifneq ($(call qstrip,$(BR2_GCC_TARGET_ARCH)),) -GST1_LIBAV_CONF_EXTRA_OPTS += --cpu=$(BR2_GCC_TARGET_ARCH) +# Default to --cpu=generic for MIPS architecture, in order to avoid a +# build failure on mips64r6. +ifeq ($(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el),y) +GST1_LIBAV_CONF_EXTRA_OPTS += --cpu=generic +else ifneq ($(GCC_TARGET_CPU),) +GST1_LIBAV_CONF_EXTRA_OPTS += --cpu=$(GCC_TARGET_CPU) +else ifneq ($(GCC_TARGET_ARCH),) +GST1_LIBAV_CONF_EXTRA_OPTS += --cpu=$(GCC_TARGET_ARCH) endif ifeq ($(BR2_X86_CPU_HAS_MMX),y)