[119246] trunk/dports/sysutils/clamav

[dluke at macports.org]

Revision: 119246
          https://trac.macports.org/changeset/119246
Author:   dluke at macports.org
Date:     2014-04-21 08:40:33 -0700 (Mon, 21 Apr 2014)
Log Message:
-----------
clamav: fix build with xcode 5.1, remove -R argument from clamav-config (should fix #43123)

Modified Paths:
--------------
    trunk/dports/sysutils/clamav/Portfile

Added Paths:
-----------
    trunk/dports/sysutils/clamav/files/
    trunk/dports/sysutils/clamav/files/patch-libclamav-LoopInfo.h.diff

Modified: trunk/dports/sysutils/clamav/Portfile
===================================================================
--- trunk/dports/sysutils/clamav/Portfile	2014-04-21 15:16:45 UTC (rev 119245)
+++ trunk/dports/sysutils/clamav/Portfile	2014-04-21 15:40:33 UTC (rev 119246)
@@ -5,6 +5,7 @@
 
 name			clamav
 version		 	0.98.1
+revision		1
 categories	  	sysutils
 maintainers	 	geeklair.net:dluke
 description	 	clamav antivirus software
@@ -38,6 +39,12 @@
 			configure.cflags {-O0}
 		}
 
+platform darwin {
+			#- patch for build error with Xcode 5.1
+			#- upstream bug https://bugzilla.clamav.net/show_bug.cgi?id=10757
+			patchfiles-append patch-libclamav-LoopInfo.h.diff
+		}
+
 post-destroot {
 			#muniversal should allow this to be hooked in some way that's less gross
 			#this code copied from nspr's portfile
@@ -50,7 +57,8 @@
 				reinplace "s|-arch ${build_arch}||g" ${destroot}${prefix}/bin/clamav-config
 				reinplace "s|-L\$\{exec_prefix\}/lib/${build_arch}||g" ${destroot}${prefix}/bin/clamav-config
 				}
-			}
+			reinplace "s|-R${prefix}/lib||g" ${destroot}${prefix}/bin/clamav-config
+		}
 
 variant clamav_milter description {build with libmilter support} {
 			depends_lib-append port:libmilter

Added: trunk/dports/sysutils/clamav/files/patch-libclamav-LoopInfo.h.diff
===================================================================
--- trunk/dports/sysutils/clamav/files/patch-libclamav-LoopInfo.h.diff	                        (rev 0)
+++ trunk/dports/sysutils/clamav/files/patch-libclamav-LoopInfo.h.diff	2014-04-21 15:40:33 UTC (rev 119246)
@@ -0,0 +1,16 @@
+--- libclamav/c++/llvm/include/llvm/Analysis/LoopInfo.h	
++++ libclamav/c++/llvm/include/llvm/Analysis/LoopInfo.h	
+@@ -814,8 +814,12 @@ public:
+         typedef GraphTraits<Inverse<BlockT*> > InvBlockTraits;
+         
+         // Add all of the predecessors of X to the end of the work stack...
+-        TodoStack.insert(TodoStack.end(), InvBlockTraits::child_begin(X),
+-                         InvBlockTraits::child_end(X));
++        for (typename InvBlockTraits::ChildIteratorType PI =
++              InvBlockTraits::child_begin(X), PE = InvBlockTraits::child_end(X);
++              PI != PE; ++PI) {
++          typename InvBlockTraits::NodeType *N = *PI;
++          TodoStack.push_back(N);
++        }
+       }
+     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140421/fa48dfae/attachment.html>