Attachment #150158 for bug #195655

Lines 3-8 Link Here

(-)multimedia/libvpx/files/patch-build_make_Makefile (+9 lines)
3		3
4	--- build/make/Makefile.orig	4	--- build/make/Makefile.orig
5	+++ build/make/Makefile	5	+++ build/make/Makefile
		6	@@ -158,7 +158,7 @@
		7	$(qexec)$(AS) $(ASFLAGS) -o $@ $<
		8
		9	.PRECIOUS: %.c.S
		10	-%.c.S: CFLAGS += -DINLINE_ASM
		11	+%.c.S: CFLAGS += -DINLINE_ASM $(CLANG_NO_IAS)
		12	$(BUILD_PFX)%.c.S: %.c
		13	$(if $(quiet),@echo " [GEN] $@")
		14	$(qexec)$(CC) -S $(CFLAGS) -o $@ $<
6	@@ -230,8 +230,8 @@	15	@@ -230,8 +230,8 @@
7	define install_map_template	16	define install_map_template
8	$(DIST_DIR)/$(1): $(2)	17	$(DIST_DIR)/$(1): $(2)




$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




 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
 

Return to bug 195655

Line 0 Link Here

(-)multimedia/libvpx/files/patch-build_make_configure.sh (+21 lines)
	1	$FreeBSD$
	2
	3	--- build/make/configure.sh.orig 2014-12-03 18:11:14.000000000 +0100
	4	+++ build/make/configure.sh 2014-12-03 20:20:00.000000000 +0100
	5	@@ -382,6 +382,7 @@
	6	print_webm_license config.mk "##" ""
	7	echo '# This file automatically generated by configure. Do not edit!' >> config.mk
	8	echo "TOOLCHAIN := ${toolchain}" >> config.mk
	9	+ echo "CLANG_NO_IAS=${CLANG_NO_IAS}" >> config.mk
	10
	11	case ${toolchain} in
	12	*-linux-rvct)
	13	@@ -1019,7 +1019,7 @@ EOF
	14	bits=32
	15	enabled x86_64 && bits=64
	16	check_cpp <<EOF && bits=x32
	17	-#ifndef __ILP32__
	18	+#if !defined(__ILP32__) \|\| !defined(__x86_64__)
	19	#error "not x32"
	20	#endif
	21	EOF

Lines 11-13 Link Here

(-)multimedia/libvpx/files/patch-configure (+25 lines)
11	all_platforms="${all_platforms} generic-gnu"	11	all_platforms="${all_platforms} generic-gnu"
12		12
13	# all_targets is a list of all targets that can be configured	13	# all_targets is a list of all targets that can be configured
		14	@@ -611,15 +612,15 @@
		15	check_add_cflags -Wimplicit-function-declaration
		16	check_add_cflags -Wuninitialized
		17	check_add_cflags -Wunused-variable
		18	- case ${CC} in
		19	- clang)
		20	- # libvpx and/or clang have issues with aliasing:
		21	- # https://code.google.com/p/webm/issues/detail?id=603
		22	- # work around them until they are fixed
		23	- check_add_cflags -fno-strict-aliasing
		24	- ;;
		25	- *) check_add_cflags -Wunused-but-set-variable ;;
		26	- esac
		27	+ if ${CC} -v 2>&1 \| grep "clang version" >/dev/null; then
		28	+ # libvpx and/or clang have issues with aliasing:
		29	+ # https://code.google.com/p/webm/issues/detail?id=603
		30	+ # work around them until they are fixed
		31	+ check_add_cflags -fno-strict-aliasing
		32	+ CLANG_NO_IAS=-no-integrated-as
		33	+ else
		34	+ check_add_cflags -Wunused-but-set-variable
		35	+ fi
		36	enabled extra_warnings \|\| check_add_cflags -Wno-unused-function
		37	fi
		38