[94253] trunk/dports/devel/libdevil

[jmr at macports.org]

Revision: 94253
          https://trac.macports.org/changeset/94253
Author:   jmr at macports.org
Date:     2012-06-13 06:32:48 -0700 (Wed, 13 Jun 2012)
Log Message:
-----------
libdevil: allow building with clang by not passing a bogus -std= arg to the C++ compiler (#31765)

Modified Paths:
--------------
    trunk/dports/devel/libdevil/Portfile

Added Paths:
-----------
    trunk/dports/devel/libdevil/files/patch-CXXFLAGS.diff

Modified: trunk/dports/devel/libdevil/Portfile
===================================================================
--- trunk/dports/devel/libdevil/Portfile	2012-06-13 13:30:05 UTC (rev 94252)
+++ trunk/dports/devel/libdevil/Portfile	2012-06-13 13:32:48 UTC (rev 94253)
@@ -40,7 +40,8 @@
 patchfiles          patch-ilur.c \
                     patch-devil_internal_exports.h.diff \
                     patch-src_IL-src-il_png.c.diff \
-                    patch-src_IL-src-il_icon.c.diff
+                    patch-src_IL-src-il_icon.c.diff \
+                    patch-CXXFLAGS.diff
 
 configure.args      --enable-ILU \
                     --enable-ILUT \
@@ -65,11 +66,6 @@
 set merger_configure_args(ppc) --enable-ppc
 set merger_configure_args(ppc64) --enable-ppc
 
-# clang++ -std=gnu99 yields an error, #31765
-if {${configure.compiler} == "clang"} {
-    configure.compiler llvm-gcc-4.2
-}
-
 post-destroot {
     xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
     xinstall -m 644 -W ${worksrcpath} AUTHORS COPYING CREDITS ChangeLog \

Added: trunk/dports/devel/libdevil/files/patch-CXXFLAGS.diff
===================================================================
--- trunk/dports/devel/libdevil/files/patch-CXXFLAGS.diff	                        (rev 0)
+++ trunk/dports/devel/libdevil/files/patch-CXXFLAGS.diff	2012-06-13 13:32:48 UTC (rev 94253)
@@ -0,0 +1,11 @@
+--- lib/Makefile.in.orig	2009-03-09 07:46:18.000000000 +1100
++++ lib/Makefile.in	2012-06-13 23:25:16.000000000 +1000
+@@ -352,7 +352,7 @@
+ AM_CFLAGS = $(GENERAL_CFLAGS)
+ libIL_la_CPPFLAGS = -I $(il_include) -I $(all_include)
+ libIL_la_CFLAGS = $(AM_CFLAGS) @IL_CFLAGS@
+-libIL_la_CXXFLAGS = $(AM_CFLAGS) @IL_CFLAGS@
++libIL_la_CXXFLAGS = `echo $(AM_CFLAGS) | sed 's|-std=gnu99||'` @IL_CFLAGS@
+ libIL_la_SOURCES = $(il_src)/il_alloc.c $(il_src)/il_doom.c \
+ 	$(il_src)/il_stack.c $(il_src)/il_pcx.c $(il_src)/il_rle.c \
+ 	$(il_src)/il_bits.c $(il_src)/il_endian.c $(il_src)/il_exr.cpp \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120613/432650c2/attachment-0001.html>