Revision
100166
Author
ryandesign@macports.org
Date
2012-12-01 01:44:24 -0800 (Sat, 01 Dec 2012)

Log Message

quickfix: ensure we're UsingTheRightCompiler and -arch flags in UnitTest++; blacklist clang because the tests (which are automatically run) fail with clang

Modified Paths

Added Paths

Diff

Modified: trunk/dports/devel/quickfix/Portfile (100165 => 100166)


--- trunk/dports/devel/quickfix/Portfile	2012-12-01 09:34:20 UTC (rev 100165)
+++ trunk/dports/devel/quickfix/Portfile	2012-12-01 09:44:24 UTC (rev 100166)
@@ -25,8 +25,15 @@
 
 depends_lib         port:libxml2
 
+# error: Failure in test: Expected 2 but was 0
+compiler.blacklist  clang
+
+patchfiles          patch-UnitTest++-Makefile.diff
+
 post-patch {
    reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/configure
+   reinplace "s|@CXX@|${configure.cxx}|g" ${worksrcpath}/UnitTest++/Makefile
+   reinplace "s|@ARCHFLAGS@|${configure.cxx_archflags}|g" ${worksrcpath}/UnitTest++/Makefile
 }
 
 configure.args      --with-java

Added: trunk/dports/devel/quickfix/files/patch-UnitTest++-Makefile.diff (0 => 100166)


--- trunk/dports/devel/quickfix/files/patch-UnitTest++-Makefile.diff	                        (rev 0)
+++ trunk/dports/devel/quickfix/files/patch-UnitTest++-Makefile.diff	2012-12-01 09:44:24 UTC (rev 100166)
@@ -0,0 +1,12 @@
+--- UnitTest++/Makefile.orig	2010-03-25 09:58:41.000000000 -0500
++++ UnitTest++/Makefile	2012-12-01 03:36:40.000000000 -0600
+@@ -1,6 +1,6 @@
+-CXX = g++
+-CXXFLAGS ?= -g -Wall -W -Winline -ansi 
+-LDFLAGS ?= 
++CXX = @CXX@
++CXXFLAGS ?= -g -Wall -W -Winline -ansi @ARCHFLAGS@
++LDFLAGS ?= @ARCHFLAGS@
+ SED = sed
+ MV = mv
+ RM = rm