svn commit: r374255 - head/multimedia/libvpx/files

[Ashish SHUKLA]

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), at 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
+