From owner-svn-ports-all@FreeBSD.ORG  Mon Dec  8 09:13:24 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 296304F9;
 Mon,  8 Dec 2014 09:13:24 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 15B311F8;
 Mon,  8 Dec 2014 09:13:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB89DNlU088432;
 Mon, 8 Dec 2014 09:13:23 GMT (envelope-from ashish@FreeBSD.org)
Received: (from ashish@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB89DNfB088429;
 Mon, 8 Dec 2014 09:13:23 GMT (envelope-from ashish@FreeBSD.org)
Message-Id: <201412080913.sB89DNfB088429@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ashish set sender to
 ashish@FreeBSD.org using -f
From: Ashish SHUKLA <ashish@FreeBSD.org>
Date: Mon, 8 Dec 2014 09:13:23 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r374255 - head/multimedia/libvpx/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Dec 2014 09:13:24 -0000

Author: ashish
Date: Mon Dec  8 09:13:22 2014
New Revision: 374255
URL: https://svnweb.freebsd.org/changeset/ports/374255
QAT: https://qat.redports.org/buildarchive/r374255/

Log:
  Add fix for building with clang 3.5

Added:
  head/multimedia/libvpx/files/patch-build_make_configure.sh   (contents, props changed)
Modified:
  head/multimedia/libvpx/files/patch-build_make_Makefile
  head/multimedia/libvpx/files/patch-configure

Modified: head/multimedia/libvpx/files/patch-build_make_Makefile
==============================================================================
--- head/multimedia/libvpx/files/patch-build_make_Makefile	Mon Dec  8 09:12:08 2014	(r374254)
+++ head/multimedia/libvpx/files/patch-build_make_Makefile	Mon Dec  8 09:13:22 2014	(r374255)
@@ -3,6 +3,15 @@ $FreeBSD$
 
 --- build/make/Makefile.orig
 +++ build/make/Makefile
+@@ -158,7 +158,7 @@
+ 	$(qexec)$(AS) $(ASFLAGS) -o $@ $<
+ 
+ .PRECIOUS: %.c.S
+-%.c.S: CFLAGS += -DINLINE_ASM
++%.c.S: CFLAGS += -DINLINE_ASM $(CLANG_NO_IAS)
+ $(BUILD_PFX)%.c.S: %.c
+ 	$(if $(quiet),@echo "    [GEN] $@")
+ 	$(qexec)$(CC) -S $(CFLAGS) -o $@ $<
 @@ -230,8 +230,8 @@
  define install_map_template
  $(DIST_DIR)/$(1): $(2)

Added: head/multimedia/libvpx/files/patch-build_make_configure.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/libvpx/files/patch-build_make_configure.sh	Mon Dec  8 09:13:22 2014	(r374255)
@@ -0,0 +1,21 @@
+$FreeBSD$
+
+--- build/make/configure.sh.orig	2014-12-03 18:11:14.000000000 +0100
++++ build/make/configure.sh	2014-12-03 20:20:00.000000000 +0100
+@@ -382,6 +382,7 @@
+     print_webm_license config.mk "##" ""
+     echo '# This file automatically generated by configure. Do not edit!' >> config.mk
+     echo "TOOLCHAIN := ${toolchain}" >> config.mk
++    echo "CLANG_NO_IAS=${CLANG_NO_IAS}" >> config.mk
+ 
+     case ${toolchain} in
+         *-linux-rvct)
+@@ -1019,7 +1019,7 @@ EOF
+         bits=32
+         enabled x86_64 && bits=64
+         check_cpp <<EOF && bits=x32
+-#ifndef __ILP32__
++#if !defined(__ILP32__) || !defined(__x86_64__)
+ #error "not x32"
+ #endif
+ EOF

Modified: head/multimedia/libvpx/files/patch-configure
==============================================================================
--- head/multimedia/libvpx/files/patch-configure	Mon Dec  8 09:12:08 2014	(r374254)
+++ head/multimedia/libvpx/files/patch-configure	Mon Dec  8 09:13:22 2014	(r374255)
@@ -11,3 +11,28 @@ $FreeBSD$
  all_platforms="${all_platforms} generic-gnu"
  
  # all_targets is a list of all targets that can be configured
+@@ -611,15 +612,15 @@
+         check_add_cflags -Wimplicit-function-declaration
+         check_add_cflags -Wuninitialized
+         check_add_cflags -Wunused-variable
+-        case ${CC} in
+-          *clang*)
+-              # libvpx and/or clang have issues with aliasing:
+-              # https://code.google.com/p/webm/issues/detail?id=603
+-              # work around them until they are fixed
+-              check_add_cflags -fno-strict-aliasing
+-          ;;
+-          *) check_add_cflags -Wunused-but-set-variable ;;
+-        esac
++        if ${CC} -v 2>&1 | grep "clang version" >/dev/null; then
++          # libvpx and/or clang have issues with aliasing:
++          # https://code.google.com/p/webm/issues/detail?id=603
++          # work around them until they are fixed
++          check_add_cflags -fno-strict-aliasing
++          CLANG_NO_IAS=-no-integrated-as
++        else
++          check_add_cflags -Wunused-but-set-variable
++        fi
+         enabled extra_warnings || check_add_cflags -Wno-unused-function
+     fi
+