Attachment #150154 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 -fno-integrated-as
		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
@@ -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

Return to bug 195655

Line 0 Link Here

(-)multimedia/libvpx/files/patch-build_make_configure.sh (+13 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	@@ -1019,7 +1019,7 @@ EOF
	6	bits=32
	7	enabled x86_64 && bits=64
	8	check_cpp <<EOF && bits=x32
	9	-#ifndef __ILP32__
	10	+#if !defined(__ILP32__) \|\| !defined(__x86_64__)
	11	#error "not x32"
	12	#endif
	13	EOF