From patchwork Sun Feb 28 23:10:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 589656 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]) by ozlabs.org (Postfix) with ESMTP id 5D4BE140557 for ; Mon, 29 Feb 2016 10:10:34 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 66A608AF8D; Sun, 28 Feb 2016 23:10:33 +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 l82YsyCflUBG; Sun, 28 Feb 2016 23:10:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 63F288A068; Sun, 28 Feb 2016 23:10:30 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id CFDCF1C136A for ; Sun, 28 Feb 2016 23:10:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id CB3CD94A59 for ; Sun, 28 Feb 2016 23:10:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aNKK3tsCDGue for ; Sun, 28 Feb 2016 23:10:27 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from exchange.essensium.com (220.77.144.195.ipv4.evonet.be [195.144.77.220]) by hemlock.osuosl.org (Postfix) with ESMTPS id 36BF694A48 for ; Sun, 28 Feb 2016 23:10:26 +0000 (UTC) Received: from localhost.localdomain (10.3.7.11) by beleexch01.local.ess-mail.com (10.3.7.8) with Microsoft SMTP Server (TLS) id 15.0.847.32; Mon, 29 Feb 2016 00:10:04 +0100 From: "Arnout Vandecappelle (Essensium/Mind)" To: Date: Mon, 29 Feb 2016 00:10:00 +0100 Message-ID: <1456701000-18047-1-git-send-email-arnout@mind.be> X-Mailer: git-send-email 2.7.0 MIME-Version: 1.0 X-Originating-IP: [10.3.7.11] X-ClientProxiedBy: beleexch01.local.ess-mail.com (10.3.7.8) To beleexch01.local.ess-mail.com (10.3.7.8) Subject: [Buildroot] [PATCH] gst1-av: pass --cpu= option to libav configure 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: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The configure script tries to guess a lot based on the cpu for which it is configured. Without --cpu, it will use a 'generic' cpu and disable any other options we pass to it. In addition, we have to pass the --sysroot option like we do in the ffmpeg package. This makes sure that regardless of the architecture options that ffmpeg passes along, an external multilib toolchain doesn't try to use a subdirectory of the sysroot. The libav build system will pass a --isysroot argument which overrides the multilib subdir. Finally, we have to properly enable/disable the architecture-specific optimisations. Autodetection of these things is completely borked in the configure script. Fixes: http://autobuild.buildroot.net/results/ce83513135e7765c171353815947d715eb897d3d Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Cc: Vicente Olivert Riera --- The --isysroot is something we should probably do in the toolchain wrapper. --- package/gstreamer1/gst1-libav/gst1-libav.mk | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index 3a987a7..97ff40f 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -10,7 +10,10 @@ GST1_LIBAV_SITE = http://gstreamer.freedesktop.org/src/gst-libav GST1_LIBAV_DEPENDENCIES = host-pkgconf gstreamer1 gst1-plugins-base -GST1_LIBAV_CONF_EXTRA_OPTS = --cross-prefix=$(TARGET_CROSS) --target-os=linux +GST1_LIBAV_CONF_EXTRA_OPTS = \ + --cross-prefix=$(TARGET_CROSS) \ + --target-os=linux \ + --sysroot=$(STAGING_DIR) ifeq ($(BR2_PACKAGE_ZLIB),y) GST1_LIBAV_CONF_EXTRA_OPTS += --enable-zlib @@ -26,6 +29,12 @@ else GST1_LIBAV_CONF_EXTRA_OPTS += --disable-bzlib endif +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) +endif + ifeq ($(BR2_X86_CPU_HAS_MMX),y) GST1_LIBAV_CONF_EXTRA_OPTS += --enable-yasm GST1_LIBAV_DEPENDENCIES += host-yasm @@ -74,6 +83,18 @@ else GST1_LIBAV_CONF_EXTRA_OPTS += --disable-altivec endif +# Since we don't have architecture options for the DSP ASE, always disable +GST1_LIBAV_CONF_EXTRA_OPTS += --disable-mipsdspr1 --disable-mipsdspr2 + +# We don't have mips32r5 +GST1_LIBAV_CONF_EXTRA_OPTS += --disable-mips32r5 + +ifeq ($(BR2_mips_64r6),y) +GST1_LIBAV_CONF_EXTRA_OPTS += --enable-mips64r6 +else +GST1_LIBAV_CONF_EXTRA_OPTS += --disable-mips64r6 +endif + GST1_LIBAV_CONF_OPTS = \ --with-libav-extra-configure="$(GST1_LIBAV_CONF_EXTRA_OPTS)"