Attachment 150154 Details for Bug 195655 – Fix multimedia/libvpx build with clang 3.5.0

[patch] Fix multimedia/libvpx build with clang 3.5.0

multimedia__libvpx-fix-clang350-build-1.diff (text/plain), 1.67 KB, created by Dimitry Andric on 2014-12-03 21:49:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2014-12-03 21:49:26 UTC

Size: 1.67 KB

patch

obsolete

>Index: multimedia/libvpx/files/patch-build_make_Makefile
>===================================================================
>--- multimedia/libvpx/files/patch-build_make_Makefile	(revision 373712)
>+++ multimedia/libvpx/files/patch-build_make_Makefile	(working copy)
>@@ -3,6 +3,15 @@
> 
> --- 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 -fno-integrated-as
>+ $(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)
>Index: multimedia/libvpx/files/patch-build_make_configure.sh
>===================================================================
>--- multimedia/libvpx/files/patch-build_make_configure.sh	(revision 0)
>+++ multimedia/libvpx/files/patch-build_make_configure.sh	(working copy)
>@@ -0,0 +1,13 @@
>+$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
>
>Property changes on: multimedia/libvpx/files/patch-build_make_configure.sh
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 195655: 150154 | 150158