[129110] trunk/dports/multimedia/libvpx

[jeremyhu at macports.org]

Revision: 129110
          https://trac.macports.org/changeset/129110
Author:   jeremyhu at macports.org
Date:     2014-12-05 11:41:03 -0800 (Fri, 05 Dec 2014)
Log Message:
-----------
libvpx: Fix build failure with clang-3.5 and newer

Modified Paths:
--------------
    trunk/dports/multimedia/libvpx/Portfile

Added Paths:
-----------
    trunk/dports/multimedia/libvpx/files/patch-Makefile.diff

Modified: trunk/dports/multimedia/libvpx/Portfile
===================================================================
--- trunk/dports/multimedia/libvpx/Portfile	2014-12-05 19:39:39 UTC (rev 129109)
+++ trunk/dports/multimedia/libvpx/Portfile	2014-12-05 19:41:03 UTC (rev 129110)
@@ -34,7 +34,8 @@
 depends_build       port:yasm
 
 patchfiles          patch-build-make-configure.sh.diff \
-                    patch-configure.diff
+                    patch-configure.diff \
+                    patch-Makefile.diff 
 
 compiler.blacklist  macports-clang-2.9 macports-clang-3.0 {clang < 421}
 
@@ -71,6 +72,14 @@
 
 destroot.args       verbose=1
 
+# Build fix for clang-3.5 and later:
+# 
+# This is an intentional change to Clang. It now parses the assembly output by default even when emitting assembly so that the diagnostics are consistent between "clang -c" and "clang -S".
+# The solution is either to pass -fno-integrated-as to the compiler, or change the assembly produced (& probably the script that processes it) so that it's valid. Note that commenting out the line won't work: comments get stripped by the same process.
+if {[string match "*clang*" ${configure.compiler}]} {
+    build.args-append CFLAGS_S=-fno-integrated-as
+}
+
 platform darwin {
     if {${os.major} >= 10} {
         supported_archs i386 x86_64

Added: trunk/dports/multimedia/libvpx/files/patch-Makefile.diff
===================================================================
--- trunk/dports/multimedia/libvpx/files/patch-Makefile.diff	                        (rev 0)
+++ trunk/dports/multimedia/libvpx/files/patch-Makefile.diff	2014-12-05 19:41:03 UTC (rev 129110)
@@ -0,0 +1,11 @@
+--- build/make/Makefile.orig	2014-12-05 11:21:21.000000000 -0800
++++ build/make/Makefile	2014-12-05 11:25:52.000000000 -0800
+@@ -158,7 +158,7 @@ $(BUILD_PFX)%.s.o: %.s
+ 	$(qexec)$(AS) $(ASFLAGS) -o $@ $<
+ 
+ .PRECIOUS: %.c.S
+-%.c.S: CFLAGS += -DINLINE_ASM
++%.c.S: CFLAGS += -DINLINE_ASM $(CFLAGS_S)
+ $(BUILD_PFX)%.c.S: %.c
+ 	$(if $(quiet), at echo "    [GEN] $@")
+ 	$(qexec)$(CC) -S $(CFLAGS) -o $@ $<
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141205/58627718/attachment.html>