FreeBSD Bugzilla – Attachment 150158 Details for
Bug 195655
Fix multimedia/libvpx build with clang 3.5.0
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Updated fix for multimedia/libvpx build with clang 3.5.0
multimedia__libvpx-fix-clang350-build-2.diff (text/plain), 3.37 KB, created by
Dimitry Andric
on 2014-12-03 23:01:32 UTC
(
hide
)
Description:
Updated fix for multimedia/libvpx build with clang 3.5.0
Filename:
MIME Type:
Creator:
Dimitry Andric
Created:
2014-12-03 23:01:32 UTC
Size:
3.37 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 $(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) >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,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 > >Property changes on: multimedia/libvpx/files/patch-build_make_configure.sh >___________________________________________________________________ >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >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 >Index: multimedia/libvpx/files/patch-configure >=================================================================== >--- multimedia/libvpx/files/patch-configure (revision 373712) >+++ multimedia/libvpx/files/patch-configure (working copy) >@@ -11,3 +11,28 @@ > 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 >+
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 195655
:
150154
| 150158